diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-03-23 06:06:26 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-03-23 06:06:26 -0400 |
| commit | 1302bd5b452dac4ead89d55c9701d02c52882381 (patch) | |
| tree | 68e0228b7ebc79a00c08a0f2c2563fa1aeee2bb2 /GNUmakefile | |
| parent | a70662dae83e1c7b779d6409d61c2bc905c0bac0 (diff) | |
| download | cryptopp-git-1302bd5b452dac4ead89d55c9701d02c52882381.tar.gz | |
Move Darwin tools to bottom of Makefile
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/GNUmakefile b/GNUmakefile index a7368b67..11e1ae48 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -149,24 +149,6 @@ ifeq ($(IS_AIX),1) endif endif -# libc++ is LLVM's standard C++ library. If we add libc++ -# here then all user programs must use it too. The open -# question is, which choice is easier on users? -ifneq ($(IS_DARWIN),0) - CXX ?= c++ - # CRYPTOPP_CXXFLAGS += -stdlib=libc++ - ifeq ($(findstring -fno-common,$(CXXFLAGS)),) - CRYPTOPP_CXXFLAGS += -fno-common - endif - IS_APPLE_LIBTOOL=$(shell libtool -V 2>&1 | $(GREP) -i -c 'Apple') - ifeq ($(IS_APPLE_LIBTOOL),1) - AR = libtool - else - AR = /usr/bin/libtool - endif - ARFLAGS = -static -o -endif - # Uncomment for debugging # $(info Here's what we found... IS_X86: $(IS_X86), IS_X64: $(IS_X64), IS_ARM32: $(IS_ARM32), IS_ARMV8: $(IS_ARMV8)) @@ -849,6 +831,24 @@ ifeq ($(XLC_COMPILER),1) endif # -qsuppress endif # IBM XL C++ compiler +# libc++ is LLVM's standard C++ library. If we add libc++ +# here then all user programs must use it too. The open +# question is, which choice is easier on users? +ifneq ($(IS_DARWIN),0) + CXX ?= c++ + # CRYPTOPP_CXXFLAGS += -stdlib=libc++ + ifeq ($(findstring -fno-common,$(CXXFLAGS)),) + CRYPTOPP_CXXFLAGS += -fno-common + endif + IS_APPLE_LIBTOOL=$(shell libtool -V 2>&1 | $(GREP) -i -c 'Apple') + ifeq ($(IS_APPLE_LIBTOOL),1) + AR = libtool + else + AR = /usr/bin/libtool + endif + ARFLAGS = -static -o +endif + # Add -xregs=no%appl SPARC. SunCC should not use certain registers in library code. # https://docs.oracle.com/cd/E18659_01/html/821-1383/bkamt.html ifneq ($(IS_SPARC32)$(IS_SPARC64),00) |