diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2011-10-17 20:41:40 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2011-10-17 20:41:40 +0000 |
| commit | 5617efc143c18195b551038b7a50394b269d2fe0 (patch) | |
| tree | e17f9c541dc46c313a118fe8caf798f20da71fd2 | |
| parent | f197954370d4c101d2c57de5c24bd5a76f39943e (diff) | |
| download | ATCD-5617efc143c18195b551038b7a50394b269d2fe0.tar.gz | |
Mon Oct 17 20:40:35 UTC 2011 Abdul Sowayan <sowayan@gmail.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_iOS.GNU | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 95f1a70611b..9cbfc13d122 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 17 20:40:35 UTC 2011 Abdul Sowayan <sowayan@gmail.com> + + * include/makeinclude/platform_macosx_iOS.GNU: + + Minor enhancements to this file to make ACE/TAO compile again. + Sat Oct 15 00:57:11 UTC 2011 Abdullah Sowayan <sowayan@gmail.com> * ace/config-macosx-lion.h: diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU index cadc4fe5eef..015b986690f 100644 --- a/ACE/include/makeinclude/platform_macosx_iOS.GNU +++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU @@ -17,9 +17,9 @@ ifeq ($(IPHONE_TARGET), SIMULATOR) # crt1.10.7.o is missing under MacOSX 10.7, fallback to 10.6 # until apple provides the missing crt1.10.7.o - CFLAGS += -mmacosx-version-min=10.6 - CXXFLAGS += -mmacosx-version-min=10.6 - LDFLAGS += -mmacosx-version-min=10.6 + CFLAGS += -mmacosx-version-min=10.6 + CCFLAGS += -mmacosx-version-min=10.6 + LDFLAGS += -mmacosx-version-min=10.6 endif ifeq ($(IPHONE_TARGET), HARDWARE) @@ -40,8 +40,8 @@ AR:=$(IPHONE_PLATFORM)/usr/bin/ar RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib DLD = $(CXX) LD = $(CXX) -CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) -CXXFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) +CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) +CCFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf @@ -51,6 +51,6 @@ ifneq (,$(HOST_ROOT)) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) # make sure to use the target compiler, not the cross-compiler # as preprocessor for the cross-compiled idl tools - TAO_IDL_PREPROCESSOR = gcc + TAO_IDL_PREPROCESSOR = clang endif |