arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed multiarch detection on OS X

reviewable/pr7/r1
Jeffrey Walton 2015-07-09 02:19:15 -04:00
parent 6556d68543
commit 8ed9bc7f1f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GNUmakefile
View File

@ -1,6 +1,6 @@
CXXFLAGS ?= -DNDEBUG CXXFLAGS ?= -DNDEBUG
SYMBOLS ?= -g2 SYMBOLS ?= -g2
OPTIMIZE ?= -O3 OPTIMIZE ?= -O2
# -fPIC is supported, and enabled by default for x86_64. # -fPIC is supported, and enabled by default for x86_64.
# the following options reduce code size, but breaks link or makes link very slow on some systems # the following options reduce code size, but breaks link or makes link very slow on some systems
# CXXFLAGS += -ffunction-sections -fdata-sections # CXXFLAGS += -ffunction-sections -fdata-sections
@ -41,6 +41,7 @@ endif
endif endif
# End Cygwin work arounds # End Cygwin work arounds
# Merge symbols and optimizations
CXXFLAGS += $(SYMBOLS) $(OPTIMIZE) CXXFLAGS += $(SYMBOLS) $(OPTIMIZE)
ifeq ($(IS_X86),1) ifeq ($(IS_X86),1)
@ -60,13 +61,15 @@ CXXFLAGS += -fPIC
endif endif
endif endif
ifneq ($(GCC42_OR_LATER),0) # We can do integer math using the Posix shell in a GNUmakefile
ifneq ($(IS_DARWIN),0) # Below, we are building a boolean circuit that says "Darwin && (GCC 4.2 || Clang)"
MULTIARCH_SUPPORT = $(shell echo $$(($(IS_DARWIN) * ($(GCC42_OR_LATER) + $(CLANG_COMPILER)))))
ifneq ($(MULTIARCH_SUPPORT),0)
CXXFLAGS += -arch x86_64 -arch i386 CXXFLAGS += -arch x86_64 -arch i386
else else
CXXFLAGS += -march=native CXXFLAGS += -march=native
endif endif
endif
ifneq ($(INTEL_COMPILER),0) ifneq ($(INTEL_COMPILER),0)
CXXFLAGS += -wd68 -wd186 -wd279 -wd327 CXXFLAGS += -wd68 -wd186 -wd279 -wd327