summaryrefslogtreecommitdiff
path: root/ACE/include
diff options
context:
space:
mode:
authorChip Jones <jonesc@objectcomputing.com>2020-02-04 14:14:09 -0600
committerChip Jones <jonesc@objectcomputing.com>2020-02-05 09:39:28 -0600
commit848c22e162de492caa4c1c9a3ce39a4cff0849b8 (patch)
tree3630d5284893b575b5b0905ee47b43236de9c3ae /ACE/include
parent816fca070860bbbb003aa59bc2acc69f98000cc0 (diff)
downloadATCD-848c22e162de492caa4c1c9a3ce39a4cff0849b8.tar.gz
Configuration changes for iOS builds.
Diffstat (limited to 'ACE/include')
-rw-r--r--ACE/include/makeinclude/platform_macosx_iOS.GNU16
1 files changed, 8 insertions, 8 deletions
diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU
index 4e554174a6f..2ff6e44d477 100644
--- a/ACE/include/makeinclude/platform_macosx_iOS.GNU
+++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU
@@ -10,15 +10,15 @@ else
endif
ifeq ($(IPHONE_TARGET), SIMULATOR)
+ CROSS-COMPILE=1
IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer
IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk
- IPHONE_HARDWARE_ARCHITECTURE=i386
+ IPHONE_HARDWARE_ARCHITECTURE=x86_64
- # 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
- CCFLAGS += -mmacosx-version-min=10.6
- LDFLAGS += -mmacosx-version-min=10.6
+# June 2017 release, iphone 6s and later
+ CFLAGS += -miphoneos-version-min=12.0
+ CCFLAGS += -miphoneos-version-min=12.0
+ LDFLAGS += -miphoneos-version-min=12.0
endif
ifeq ($(IPHONE_TARGET), HARDWARE)
@@ -35,8 +35,8 @@ endif
CC:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
CXX:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-AR:=$(IPHONE_PLATFORM)/usr/bin/ar
-RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib
+AR:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
+RANLIB:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib
DLD = $(CXX)
LD = $(CXX)
CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK)