diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 9 | ||||
| -rw-r--r-- | cpp/config/Make.rules.AIX | 2 | ||||
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 5 | ||||
| -rw-r--r-- | cpp/config/Make.rules.HP-UX | 4 | ||||
| -rw-r--r-- | cpp/config/Make.rules.Linux | 4 | ||||
| -rw-r--r-- | cpp/config/Make.rules.SunOS | 12 |
6 files changed, 23 insertions, 13 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index e40cdcdb9f2..7f70078e38b 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -111,6 +111,15 @@ USE_READLINE ?= no # #GENPIC ?= yes +# +# The build architectures for gcc based builds. The format of these +# build flags are OS dependent. For example, under Mac OS X to build +# binaries which support both i386 and x86_64 you would use "-arch +# i386 -arch x86_64". The default is OS version dependent. Be aware +# that this value may conflict with the setting of LP64 above. +# +#CXXARCHFLAGS = -arch i386 -arch x86_64 + # ---------------------------------------------------------------------- # Don't change anything below this line! # ---------------------------------------------------------------------- diff --git a/cpp/config/Make.rules.AIX b/cpp/config/Make.rules.AIX index 3be4ff370b2..f43c194db6e 100644 --- a/cpp/config/Make.rules.AIX +++ b/cpp/config/Make.rules.AIX @@ -39,7 +39,7 @@ CC = xlc_r -qcpluscmt # ifneq ($(OBJECT_MODE),64) - CXXARCHFLAGS = -D_LARGE_FILES + CXXARCHFLAGS += -D_LARGE_FILES endif CXXFLAGS = -brtl -qrtti=all -qstaticinline $(CXXARCHFLAGS) diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index 949e4b63c9b..58a5da4a8a5 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -16,11 +16,12 @@ CXX = c++ CXXFLAGS = -Wall -D_REENTRANT ifeq ($(OPTIMIZE),yes) - CXXFLAGS := -O2 -DNDEBUG $(CXXFLAGS) + CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS) else - CXXFLAGS := -g $(CXXFLAGS) + CXXFLAGS := $(CXXARCHFLAGS) -g $(CXXFLAGS) endif + # # C++ run-time libraries, necessary for linking some shared libraries. # diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX index d9ac78bf882..372119f2f72 100644 --- a/cpp/config/Make.rules.HP-UX +++ b/cpp/config/Make.rules.HP-UX @@ -22,9 +22,9 @@ $(warning ===================================================================) CXX = aCC ifeq ($(LP64),yes) - CXXARCHFLAGS = +DD64 + CXXARCHFLAGS += +DD64 else - CXXARCHFLAGS = +DA2.0N + CXXARCHFLAGS += +DA2.0N endif # diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 57a0c6cb365..dde2f8272cc 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -43,7 +43,7 @@ ifeq ($(CXX),c++) $(warning support.) $(warning ===================================================================) USE_SPARC_ASM = yes - CXXARCHFLAGS = -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM + CXXARCHFLAGS += -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM endif ifeq ($(MACHINE),sparc) @@ -59,7 +59,7 @@ ifeq ($(CXX),c++) $(warning support.) $(warning ===================================================================) USE_SPARC_ASM = no - CXXARCHFLAGS = -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED + CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED endif ifeq ($(MACHINE),x86_64) diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index 9c429dd5dc7..ebd243bf086 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -37,22 +37,22 @@ ifeq ($(CXX),CC) ifeq ($(CCVERSION),5.9) ifeq ($(LP64),yes) - CXXARCHFLAGS = -m64 + CXXARCHFLAGS += -m64 else - CXXARCHFLAGS = -m32 + CXXARCHFLAGS += -m32 endif else ifeq ($(MACHINE_TYPE),sun4u) ifeq ($(LP64),yes) - CXXARCHFLAGS = -xarch=v9 + CXXARCHFLAGS += -xarch=v9 else - CXXARCHFLAGS = -xarch=v8plus + CXXARCHFLAGS += -xarch=v8plus endif endif ifeq ($(MACHINE_TYPE),i86pc) ifeq ($(LP64),yes) - CXXARCHFLAGS = -xarch=amd64 + CXXARCHFLAGS += -xarch=amd64 endif endif endif @@ -133,7 +133,7 @@ ifeq ($(CXX),g++) CC = gcc ifeq ($(LP64),yes) - CXXARCHFLAGS = -m64 + CXXARCHFLAGS += -m64 endif CXXFLAGS = $(CXXARCHFLAGS) -Wall -D_REENTRANT |