diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2007-07-31 10:41:17 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2007-07-31 10:41:17 +0000 |
| commit | 18672e491c457625d0c8b5a9f442d07081fd6244 (patch) | |
| tree | 51cbdd2cc4cd2103f5df388b79164ca37b155c72 | |
| parent | 856e8a150921e9bb543a7ec90f7dc9deb8dee025 (diff) | |
| download | ATCD-18672e491c457625d0c8b5a9f442d07081fd6244.tar.gz | |
ChangeLogTag:Tue Jul 31 10:38:37 UTC 2007 William Otte <wotte@dhcp-host-unknown.prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_tiger.GNU | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fe1b1b3214a..69b1bcd7e31 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Jul 31 10:38:37 UTC 2007 William Otte <wotte@dhcp-host-unknown.prismtech.com> + + * include/makeinclude/platform_macosx_tiger.GNU + + Added support for building universal binaries by specifying + universal=1 in platform_macros or command line. + Tue Jul 31 09:39:43 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * contrib/utility/Example/ExH/BadCast/bad_cast.cpp: diff --git a/ACE/include/makeinclude/platform_macosx_tiger.GNU b/ACE/include/makeinclude/platform_macosx_tiger.GNU index 96d9459a48f..8629f209ab7 100644 --- a/ACE/include/makeinclude/platform_macosx_tiger.GNU +++ b/ACE/include/makeinclude/platform_macosx_tiger.GNU @@ -13,6 +13,8 @@ debug ?= 1 optimize ?= 0 ssl ?= 1 versioned_so ?= 0 +universal ?= 0 + ifeq (,$(no_hidden_visibility)) # Disable symbol visibility support by default. # @@ -20,6 +22,7 @@ ifeq (,$(no_hidden_visibility)) # visibility attributes, at least as well as the vanilla g++. no_hidden_visibility = 1 endif + with_ld = macosx pipes ?= 1 @@ -33,7 +36,7 @@ DLD = $(CXX) LD = $(CXX) #LIBS += -lstdc++.6 -lSystem -lSystemStubs -OCFLAGS += -O2 -mcpu=G3 -mtune=G4 +OCFLAGS += -O2 RANLIB = ranlib SOEXT = dylib SOFLAGS += -dynamiclib @@ -46,3 +49,8 @@ include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU LDFLAGS += -flat_namespace CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) + +ifeq ($(universal),1) + CFLAGS += -arch i386 -arch ppc + LDFLAGS += -arch i386 -arch ppc +endif |