Skip to content

Commit ea451dd

Browse files
Apprentice-AlchemistApprentice-Alchemist
committed
[apple] Get rid of manual sdk version lookup.
1 parent 3b95937 commit ea451dd

8 files changed

+29
-194
lines changed

‎toolchain/appletvos-toolchain.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<xml>
22

3-
4-
<echo value="Using tvOS SDK ${TVOS_VER}" if="VERBOSE"/>
5-
63
<set name="ARCH" value ="-64" if="HXCPP_ARM64" />
74

85
<set name="HXCPP_USE_LIBTOOL" value="1" />
9-
<set name="HXCPP_LIBTOOL" value="xcrun --sdk appletvos${TVOS_VER} libtool" />
6+
<set name="HXCPP_LIBTOOL" value="xcrun --sdk appletvos libtool" />
107
<include name="toolchain/gcc-toolchain.xml"/>
118
<!--<path name="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/usr/bin" />-->
129

@@ -17,8 +14,8 @@
1714

1815

1916
<compiler id="AppleTVOS" exe="g++" if="appletvos">
20-
<exe name="xcrun --sdk appletvos${TVOS_VER} g++" if="HXCPP_GCC" />
21-
<exe name="xcrun --sdk appletvos${TVOS_VER} clang++" />
17+
<exe name="xcrun --sdk appletvos g++" if="HXCPP_GCC" />
18+
<exe name="xcrun --sdk appletvos clang++" />
2219
<flag value="-c"/>
2320
<!-- Removed for iOS 8 -->
2421
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
@@ -32,8 +29,6 @@
3229
<flag value="-O2" unless="debug"/>
3330
<flag value="-arch"/>
3431
<flag value="arm64" if="HXCPP_ARM64" />
35-
<flag value="-isysroot"/>
36-
<flag value="${DEVELOPER_DIR}/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS${TVOS_VER}.sdk"/>
3732
<!-- <flag value="-miphoneos-version-min=3.0" if="HXCPP_GCC" unless="HXCPP_ARMV7" />
3833
<flag value="-miphoneos-version-min=5.0" if="HXCPP_ARMV7" /> -->
3934
<flag value="-mappletvos-version-min=9.0" unless="HXCPP_GCC" />
@@ -69,17 +64,15 @@
6964
</compiler>
7065

7166
<linker id="dll" exe="g++" >
72-
<exe name="xcrun --sdk appletvos${TVOS_VER} g++" if="HXCPP_GCC" />
73-
<exe name="xcrun --sdk appletvos${TVOS_VER} clang++" />
67+
<exe name="xcrun --sdk appletvos g++" if="HXCPP_GCC" />
68+
<exe name="xcrun --sdk appletvos clang++" />
7469
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
7570
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
7671
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
7772
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
7873
<flag value="-dynamiclib"/>
7974
<flag value="-arch"/>
8075
<flag value="arm64" if="HXCPP_ARM64" />
81-
<flag value="-isysroot"/>
82-
<flag value="${DEVELOPER_DIR}/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS${TVOS_VER}.sdk"/>
8376
<flag value="-Wl,-undefined,dynamic_lookup"/>
8477
<flag value="-fpic"/>
8578
<flag value="-fPIC"/>

‎toolchain/appletvsim-toolchain.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<xml>
22

3-
<echo value="Using tvOS SDK ${TVOS_VER}" if="VERBOSE"/>
4-
53
<set name="ARCH" value ="-64" if="HXCPP_M64" />
64

75
<set name="HXCPP_USE_LIBTOOL" value="1" />
8-
<set name="HXCPP_LIBTOOL" value="xcrun --sdk appletvsimulator${TVOS_VER} libtool" />
6+
<set name="HXCPP_LIBTOOL" value="xcrun --sdk appletvsimulator libtool" />
97
<include name="toolchain/gcc-toolchain.xml"/>
108
<!--<path name="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/usr/bin" />-->
119

@@ -15,8 +13,8 @@
1513
<set name="OBJDBG" value="-dbg" if="debug" />
1614

1715
<compiler id="AppleTVSim" exe="g++" if="appletvsim">
18-
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} g++" if="HXCPP_GCC" />
19-
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} clang++" />
16+
<exe name="xcrun --sdk appletvsimulator g++" if="HXCPP_GCC" />
17+
<exe name="xcrun --sdk appletvsimulator clang++" />
2018
<flag value="-c"/>
2119
<!-- Removed for iOS 8 -->
2220
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
@@ -43,11 +41,9 @@
4341
<flag value="-Wno-unused-variable"/>
4442
<flag value="-arch"/>
4543
<flag value="x86_64" />
46-
<flag value="-isysroot"/>
47-
<flag value="${DEVELOPER_DIR}/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator${TVOS_VER}.sdk"/>
4844
<!-- Removed for iOS 8 -->
4945
<!-- <flag value="-fvisibility=hidden"/> -->
50-
<!-- <flag value="-miphoneos-version-min=${IPHONE_VER}"/> -->
46+
<!-- <flag value="-miphoneos-version-min="/> -->
5147
<flag value="-mappletvos-version-min=9.0"/>
5248
<flag value="-DAPPLETV=APPLETV"/>
5349
<flag value="-DAPPLETVSIM=APPLETVSIM"/>
@@ -76,8 +72,8 @@
7672
</compiler>
7773

7874
<linker id="dll" exe="g++" >
79-
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} g++" if="HXCPP_GCC" />
80-
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} clang++" />
75+
<exe name="xcrun --sdk appletvsimulator g++" if="HXCPP_GCC" />
76+
<exe name="xcrun --sdk appletvsimulator clang++" />
8177
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
8278
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
8379
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
@@ -86,8 +82,6 @@
8682
<flag value="-arch"/>
8783
<flag value="i386" unless="HXCPP_M64"/>
8884
<flag value="x86_64" if="HXCPP_M64"/>
89-
<flag value="-isysroot"/>
90-
<flag value="${DEVELOPER_DIR}/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator${TVOS_VER}.sdk"/>
9185
<flag value="-Wl,-undefined,dynamic_lookup"/>
9286
<flag value="-fpic"/>
9387
<flag value="-fPIC"/>

‎toolchain/iphoneos-toolchain.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<xml>
22

3-
4-
<echo value="Using iOS SDK ${IPHONE_VER}" if="VERBOSE"/>
5-
63
<set name="HXCPP_CPP11" value="1" unless="HXCPP_NO_CPP11 || HXCPP_CPP17" />
74

85
<set name="ARCH" value ="-v7" if="HXCPP_ARMV7" />
96
<set name="ARCH" value ="-v7s" if="HXCPP_ARMV7S" />
107
<set name="ARCH" value ="-64" if="HXCPP_ARM64" />
118

129
<set name="HXCPP_USE_LIBTOOL" value="1" />
13-
<set name="HXCPP_LIBTOOL" value="xcrun --sdk iphoneos${IPHONE_VER} libtool" />
10+
<set name="HXCPP_LIBTOOL" value="xcrun --sdk iphoneos libtool"/>
1411
<include name="toolchain/gcc-toolchain.xml"/>
1512
<!--<path name="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/usr/bin" />-->
1613

@@ -24,8 +21,8 @@
2421

2522

2623
<compiler id="iPhoneOS" exe="g++" if="iphoneos">
27-
<exe name="xcrun --sdk iphoneos${IPHONE_VER} g++" if="HXCPP_GCC" />
28-
<exe name="xcrun --sdk iphoneos${IPHONE_VER} clang++" />
24+
<exe name="xcrun --sdk iphoneos g++" if="HXCPP_GCC" />
25+
<exe name="xcrun --sdk iphoneos clang++"/>
2926
<flag value="-c"/>
3027
<!-- Removed for iOS 8 -->
3128
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
@@ -48,8 +45,6 @@
4845
<flag value="armv7" if="HXCPP_ARMV7" />
4946
<flag value="armv7s" if="HXCPP_ARMV7S" />
5047
<flag value="arm64" if="HXCPP_ARM64" />
51-
<flag value="-isysroot"/>
52-
<flag value="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IPHONE_VER}.sdk"/>
5348
<!-- <flag value="-miphoneos-version-min=3.0" if="HXCPP_GCC" unless="HXCPP_ARMV7" />
5449
<flag value="-miphoneos-version-min=5.0" if="HXCPP_ARMV7" /> -->
5550
<flag value="-miphoneos-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
@@ -92,8 +87,8 @@
9287
</compiler>
9388

9489
<linker id="dll" exe="g++" >
95-
<exe name="xcrun --sdk iphoneos${IPHONE_VER} g++" if="HXCPP_GCC" />
96-
<exe name="xcrun --sdk iphoneos${IPHONE_VER} clang++" />
90+
<exe name="xcrun --sdk iphoneos g++" if="HXCPP_GCC" />
91+
<exe name="xcrun --sdk iphoneos clang++" />
9792
<flag value="-Wl,-cache_path_lto,/tmp" if="HXCPP_OPTIMIZE_LINK_INCREMENTAL" unless="debug"/>
9893
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
9994
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
@@ -105,8 +100,6 @@
105100
<flag value="armv7" if="HXCPP_ARMV7" />
106101
<flag value="armv7s" if="HXCPP_ARMV7S" />
107102
<flag value="arm64" if="HXCPP_ARM64" />
108-
<flag value="-isysroot"/>
109-
<flag value="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IPHONE_VER}.sdk"/>
110103
<flag value="-Wl,-undefined,dynamic_lookup"/>
111104
<flag value="-fpic"/>
112105
<flag value="-fPIC"/>

‎toolchain/iphonesim-toolchain.xml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<xml>
22

3-
<echo value="Using iOS SDK ${IPHONE_VER}" if="VERBOSE"/>
4-
53
<set name="HXCPP_CPP11" value="1" unless="HXCPP_NO_CPP11 || HXCPP_CPP17" />
64

75
<set name="ARCH" value ="-64" if="HXCPP_M64" />
86

97
<set name="HXCPP_USE_LIBTOOL" value="1" />
10-
<set name="HXCPP_LIBTOOL" value="xcrun --sdk iphonesimulator${IPHONE_VER} libtool" />
8+
<set name="HXCPP_LIBTOOL" value="xcrun --sdk iphonesimulator libtool" if="mac_host"/>
9+
<set name="HXCPP_LIBTOOL" value="llvm-libtool-darwin -static" unless="mac_host"/>
1110
<include name="toolchain/gcc-toolchain.xml"/>
1211
<!--<path name="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/usr/bin" />-->
1312

@@ -17,9 +16,9 @@
1716
<set name="OBJGCC" value="-gcc" if="HXCPP_GCC" />
1817
<set name="OBJDBG" value="-dbg" if="debug" />
1918

20-
<compiler id="iPhoneSim" exe="g++" if="iphonesim">
21-
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} g++" if="HXCPP_GCC" />
22-
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} clang++" />
19+
<compiler id="iPhoneSim" exe="clang++" if="iphonesim">
20+
<exe name="xcrun --sdk iphonesimulator clang++" if="mac_host"/>
21+
<flag value="--target=x86_64-apple-iossim"/>
2322
<flag value="-c"/>
2423
<!-- Removed for iOS 8 -->
2524
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
@@ -55,11 +54,9 @@
5554
<flag value="-arch"/>
5655
<flag value="i386" unless="HXCPP_M64"/>
5756
<flag value="x86_64" if="HXCPP_M64"/>
58-
<flag value="-isysroot"/>
59-
<flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
6057
<!-- Removed for iOS 8 -->
6158
<!-- <flag value="-fvisibility=hidden"/> -->
62-
<!-- <flag value="-miphoneos-version-min=${IPHONE_VER}"/> -->
59+
<!-- <flag value="-miphoneos-version-min="/> -->
6360
<flag value="-miphoneos-version-min=9.0" unless="HXCPP_IOS_MIN_VERSION" />
6461
<flag value="-miphoneos-version-min=${HXCPP_IOS_MIN_VERSION}" if="HXCPP_IOS_MIN_VERSION" />
6562
<flag value="-DIPHONE=IPHONE"/>
@@ -86,9 +83,8 @@
8683
<objdir value="obj/iphonesim${OBJGCC}${OBJDBG}/" />
8784
</compiler>
8885

89-
<linker id="dll" exe="g++" >
90-
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} g++" if="HXCPP_GCC" />
91-
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} clang++" />
86+
<linker id="dll" exe="clang++" >
87+
<exe name="xcrun --sdk iphonesimulator clang++" if="mac_host"/>
9288
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
9389
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
9490
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
@@ -97,8 +93,6 @@
9793
<flag value="-arch"/>
9894
<flag value="i386" unless="HXCPP_M64"/>
9995
<flag value="x86_64" if="HXCPP_M64"/>
100-
<flag value="-isysroot"/>
101-
<flag value="${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_VER}.sdk"/>
10296
<flag value="-Wl,-undefined,dynamic_lookup"/>
10397
<flag value="-fpic"/>
10498
<flag value="-fPIC"/>

‎toolchain/mac-toolchain.xml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.9" if="HXCPP_CPP11||HXCPP_CPP14||HXCPP_CPP17" unless="MACOSX_DEPLOYMENT_TARGET"/>
1010
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.7" if="OBJC_ARC" unless="MACOSX_DEPLOYMENT_TARGET" />
1111
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.6" unless="MACOSX_DEPLOYMENT_TARGET" />
12-
<path name="${DEVELOPER_DIR}/usr/bin" />
1312
<set name="HXCPP_LTO_THIN" value="1" if="HXCPP_OPTIMIZE_LINK_INCREMENTAL"/>
1413

1514
<set name="STDLIBCPP" value="1" unless="HXCPP_GCC || HXCPP_CPP11 || HXCPP_CPP14 || HXCPP_CPP17" />
@@ -23,7 +22,7 @@
2322

2423

2524
<compiler id="darwin" exe="g++" if="macos">
26-
<exe name="xcrun --sdk macosx${MACOSX_VER} clang++" if="HXCPP_CLANG" />
25+
<exe name="xcrun --sdk macosx clang++" if="HXCPP_CLANG" />
2726
<flag value="-c"/>
2827
<flag value="-fvisibility=hidden"/>
2928
<cppflag value="-std=c++11" if="HXCPP_CPP11"/>
@@ -39,9 +38,6 @@
3938
<cppflag value="-frtti"/>
4039
<pchflag value="-x" />
4140
<pchflag value="c++-header" />
42-
<flag value="-Qunused-arguments" if="LEGACY_MACOSX_SDK"/>
43-
<flag value="-isysroot" unless="LEGACY_MACOSX_SDK"/>
44-
<flag value="${DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_VER}.sdk" unless="LEGACY_MACOSX_SDK"/>
4541
<flag value="-g" if="debug"/>
4642
<flag value="-O2" unless="debug"/>
4743
<flag value="-I${HXCPP}/include"/>
@@ -69,11 +65,11 @@
6965
<flag value="-msse4.1" if="HXCPP_SSE4" unless="HXCPP_ARM" />
7066
<outflag value="-o"/>
7167
<ext value=".o"/>
72-
<getversion value="xcrun --sdk macosx${MACOSX_VER} clang++ -v" if="HXCPP_CLANG" />
68+
<getversion value="xcrun --sdk macosx clang++ -v" if="HXCPP_CLANG" />
7369
</compiler>
7470

7571
<linker id="dll" exe="g++" if="macos">
76-
<exe name="xcrun --sdk macosx${MACOSX_VER} clang++" if="HXCPP_CLANG" />
72+
<exe name="xcrun --sdk macosx clang++" if="HXCPP_CLANG" />
7773
<fromfile value="" if="GCC_OLD" />
7874
<flag value="-Wl,-bundle,-bundle_loader,${dll_import_link}" if="dll_import_link" />
7975
<flag value="-Wl,-cache_path_lto,/tmp" if="HXCPP_LTO_THIN" unless="debug"/>
@@ -88,16 +84,14 @@
8884
<flag value="${HXCPP_ARCH}"/>
8985
<flag value="-framework"/>
9086
<flag value="Cocoa"/>
91-
<flag value="-isysroot" unless="LEGACY_MACOSX_SDK"/>
92-
<flag value="${DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_VER}.sdk" unless="LEGACY_MACOSX_SDK"/>
9387
<flag value="-fvisibility=hidden"/>
94-
<!-- <flag value="-debug" if="debug"/> -->
88+
<!-- <flag value="-debug" if="debug"/> -->
9589
<ext value=".dylib"/>
9690
<outflag value="-o "/>
9791
</linker>
9892

9993
<linker id="exe" exe="g++" if="macos">
100-
<exe name="xcrun --sdk macosx${MACOSX_VER} clang++" if="HXCPP_CLANG" />
94+
<exe name="xcrun --sdk macosx clang++" if="HXCPP_CLANG" />
10195
<!-- <flag value="-Wl,-stack_size,0x8000"/> -->
10296
<flag value="-rpath" />
10397
<flag value="@executable_path"/>
@@ -110,8 +104,6 @@
110104
<mmflag value="-stdlib=libstdc++" if="STDLIBCPP" />
111105
<flag value="-framework"/>
112106
<flag value="Cocoa"/>
113-
<flag value="-isysroot" unless="LEGACY_MACOSX_SDK"/>
114-
<flag value="${DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_VER}.sdk" unless="LEGACY_MACOSX_SDK"/>
115107
<flag value="-fsanitize=thread" if="HXCPP_THREAD_SANITIZE" />
116108
<!-- <flag value="-debug" if="debug"/> -->
117109
<flag value="-arch" />

‎toolchain/watchos-toolchain.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<xml>
2-
3-
<echo value="Using WatchOS SDK ${WATCHOS_VER}" if="VERBOSE"/>
4-
52
<set name="HXCPP_USE_LIBTOOL" value="1" />
63
<set name="HXCPP_LIBTOOL" value="xcrun --toolchain WatchOS libtool" />
74
<include name="toolchain/gcc-toolchain.xml"/>
@@ -30,9 +27,6 @@
3027

3128
<flag value="-g" />
3229

33-
<flag value="-isysroot"/>
34-
<flag value="${DEVELOPER_DIR}/Platforms/WatchOS.platform/Developer/SDKs/WatchOS${WATCHOS_VER}.sdk"/>
35-
3630
<flag value="-fapplication-extension" />
3731

3832
<flag value="-O2" unless="debug"/>

‎toolchain/watchsimulator-toolchain.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<xml>
2-
3-
<echo value="Using WatchSimulator SDK ${WATCHOS_VER}" if="VERBOSE"/>
4-
52
<set name="HXCPP_USE_LIBTOOL" value="1" />
63
<set name="HXCPP_LIBTOOL" value="xcrun --toolchain WatchSimulator libtool" />
74
<include name="toolchain/gcc-toolchain.xml"/>
@@ -29,9 +26,6 @@
2926
<flag value="-std=c++11" if="HXCPP_CPP11" />
3027
<flag value="-g" />
3128

32-
<flag value="-isysroot"/>
33-
<flag value="${DEVELOPER_DIR}/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator${WATCHOS_VER}.sdk"/>
34-
3529
<flag value="-fapplication-extension" />
3630

3731
<flag value="-O2" unless="debug"/>

0 commit comments

Comments
 (0)