diff options
| author | Jose <jose@zeroc.com> | 2012-02-16 00:20:36 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-02-16 00:20:36 +0100 |
| commit | ae3822cfa6e2ad5f17d0bb001ed98e9453b7cb68 (patch) | |
| tree | d2ec8c89ed6d423ec798545f30ef8fadfc672814 /cpp | |
| parent | Minor fix to cs/INSTALL.MONO (diff) | |
| download | ice-ae3822cfa6e2ad5f17d0bb001ed98e9453b7cb68.tar.bz2 ice-ae3822cfa6e2ad5f17d0bb001ed98e9453b7cb68.tar.xz ice-ae3822cfa6e2ad5f17d0bb001ed98e9453b7cb68.zip | |
ICE-4693 - LP64 should not be used on OS X
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 22 | ||||
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 7 |
2 files changed, 19 insertions, 10 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index cdaaed94b0c..9d191cec0df 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -34,11 +34,22 @@ create_runpath_symlink ?= no # # Define LP64 as yes or no if you want force a 32 or 64 bit. The -# default is platform-dependent +# default is platform-dependent. This property has no effect in Mac +# OS X. In Mac OS X use CXXARCHFLAGS bellow to establish the build +# architectures. # #LP64 ?= yes # +# The build architectures for gcc/llvm 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 + +# # Define USE_READLINE as yes if you want to build parts of Ice using # readline on platforms where readline is available (see # PLATFORM_HAS_READLINE in Make.rules.$(UNAME)) @@ -119,15 +130,6 @@ 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 - -# # Default Mutex protocol: one of PrioNone or PrioInherit. # #DEFAULT_MUTEX_PROTOCOL ?= PrioNone diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index 6ad463a0254..ffaa2c1a816 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -16,6 +16,13 @@ CXX = c++ CXXFLAGS = -Wall -D_REENTRANT +# +# By default we build binaries with both architectures +# +ifeq ($(CXXARCHFLAGS),) + CXXARCHFLAGS := -arch i386 -arch x86_64 +endif + ifeq ($(OPTIMIZE),yes) CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS) else |