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

GNUmakefile improvements. Changed default optimization level to -O3, except on Cygwin. Added IS_DARWIN for consistency

reviewable/pr7/r1
Jeffrey Walton 2015-07-08 15:34:23 -04:00
parent 6cfee97b27
commit 94f28091e8
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
GNUmakefile
View File

@ -1,7 +1,7 @@
CXXFLAGS = -DNDEBUG -g -O2 CXXFLAGS ?= -DNDEBUG
# -O3 fails to link on Cygwin GCC version 4.5.3 SYMBOLS ?= -g2
OPTIMIZE ?= -O3
# -fPIC is supported, and enabled by default for x86_64. # -fPIC is supported, and enabled by default for x86_64.
# CXXFLAGS += -fPIC
# 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
# LDFLAGS += -Wl,--gc-sections # LDFLAGS += -Wl,--gc-sections
@ -13,6 +13,7 @@ EGREP = egrep
UNAME = $(shell uname) UNAME = $(shell uname)
IS_X86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64") IS_X86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
IS_X86_64 = $(shell uname -m | $(EGREP) -c "_64|d64") IS_X86_64 = $(shell uname -m | $(EGREP) -c "_64|d64")
IS_DARWIN = $(shell uname -s | $(EGREP) -i -c "darwin")
IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun") IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun")
IS_LINUX = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "linux") IS_LINUX = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "linux")
IS_MINGW = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "mingw") IS_MINGW = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "mingw")
@ -24,13 +25,24 @@ ifeq ($(PREFIX),)
PREFIX = /usr PREFIX = /usr
endif endif
# For some reason CXX is gcc on cygwin 1.1.4 # Cygwin work arounds
ifneq ($(IS_CYGWIN),0) ifneq ($(IS_CYGWIN),0)
# For some reason CXX is gcc on Cygwin 1.1.4
ifeq ($(CXX),gcc) ifeq ($(CXX),gcc)
CXX = g++ CXX = g++
endif endif
# -O3 fails to link with GCC 4.5.3, and causes a core dump with GCC 4.9
ifeq ($(findstring -O3,$(OPTIMIZE)),-O3)
OPTIMIZE = -O2
endif endif
endif
# End Cygwin work arounds
CXXFLAGS += $(SYMBOLS) $(OPTIMIZE)
ifeq ($(IS_X86),1) ifeq ($(IS_X86),1)
GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])") GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
@ -40,7 +52,7 @@ GAS210_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EG
GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])") GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
#Enable PIC for x86_64 targets # Enable PIC for x86_64 targets
ifneq ($(IS_X86_64),0) ifneq ($(IS_X86_64),0)
# But don't enable it on Cygwin x86_64 # But don't enable it on Cygwin x86_64
ifeq ($(IS_CYGWIN),0) ifeq ($(IS_CYGWIN),0)
@ -49,7 +61,7 @@ endif
endif endif
ifneq ($(GCC42_OR_LATER),0) ifneq ($(GCC42_OR_LATER),0)
ifeq ($(UNAME),Darwin) ifneq ($(IS_DARWIN),0)
CXXFLAGS += -arch x86_64 -arch i386 CXXFLAGS += -arch x86_64 -arch i386
else else
CXXFLAGS += -march=native CXXFLAGS += -march=native
@ -99,10 +111,10 @@ M32OR64 = -m64
endif endif
endif endif
ifeq ($(UNAME),Darwin) ifneq ($(IS_DARWIN),0)
AR = libtool AR = libtool
ARFLAGS = -static -o ARFLAGS = -static -o
CXX = c++ CXX ?= c++
IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932)
ifeq ($(IS_GCC2),1) ifeq ($(IS_GCC2),1)
CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables