diff --git a/sys/ios-sdk-gcc b/sys/ios-sdk-gcc index 73d7f7ef32..a23c4b23d7 100755 --- a/sys/ios-sdk-gcc +++ b/sys/ios-sdk-gcc @@ -7,12 +7,16 @@ CWD="$(dirname "$0")" #CC="xcrun --sdk iphoneos gcc -arch armv7 -I${CWD}/ios-include" CPUS="" CPU=`echo $CPU | sed -e 's,+, ,g'` +EXTRA="" for a in `IFS=+ echo ${CPU}` ; do + if [ "$a" = "armv7k" ]; then + EXTRA="-fembed-bitcode" + fi CPUS="-arch $a ${CPUS}" done [ -z "${SDK}" ] && SDK=iphoneos APPLE_SDK=`echo ${SDK} |tr a-z A-Z` -CC="xcrun --sdk ${SDK} gcc ${CPUS} -DAPPLE_SDK_${APPLE_SDK}=1 -I${IOSINC}" +CC="xcrun --sdk ${SDK} gcc ${CPUS} -DAPPLE_SDK_${APPLE_SDK}=1 -I${IOSINC} ${EXTRA}" echo $CC $* #CC="xcrun --sdk iphoneos gcc -arch arm64" ${CC} $* diff --git a/sys/ios-simulator.sh b/sys/ios-simulator.sh index b8a0533c06..f5da938fb2 100755 --- a/sys/ios-simulator.sh +++ b/sys/ios-simulator.sh @@ -29,6 +29,9 @@ export SDK=watchsimulator export CPU=arm64 export SDK=appletvos +export CPU=armv7k +export SDK=watchos + export BUILD=1 PREFIX="/usr" # PREFIX=/var/mobile @@ -43,7 +46,7 @@ fi export PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH export PATH=$(pwd)/sys:${PATH} -export CC=$(pwd)/sys/ios-sdk-gcc +export CC="$(pwd)/sys/ios-sdk-gcc" # set only for arm64, otherwise it is armv7 # select ios sdk version export IOSVER=9.1