From e39dad15e57e6c512598620e3e3deaea0d0ed96d Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 2 Feb 2014 19:06:35 +0100 Subject: [PATCH] Added iOS sdk path --- src/build/compile.sh | 6 ------ src/build/jenkins.sh | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/build/compile.sh b/src/build/compile.sh index 13c65b8ca..b443f5d38 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -96,15 +96,9 @@ elif [ "$1" == "crosscompile" ]; then elif [ "$2" == "ios" ] || [ "$2" == "ios-armv6" ]; then [ -z "$march" ] && march=armv6; [ -z "$mtune" ] && mtune=generic-armv6; - TOOLCHAIN_PREFIX="arm-apple-darwin10" - export CC="$TOOLCHAIN_PREFIX-llvm-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" elif [ "$2" == "ios-armv7" ]; then [ -z "$march" ] && march=armv7-a; [ -z "$mtune" ] && mtune=generic-armv7-a; - TOOLCHAIN_PREFIX="arm-apple-darwin10" - export CC="$TOOLCHAIN_PREFIX-llvm-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" else echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac ios ios-armv6 ios-armv7] to cross-compile" exit 1 diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh index 0c46cf8d9..9e25ed244 100644 --- a/src/build/jenkins.sh +++ b/src/build/jenkins.sh @@ -118,7 +118,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv6 cd $COMPILEDIR/crosscompile/ios-armv6 - $SCRIPT crosscompile ios-armv6 + PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/:$PATH" $SCRIPT crosscompile ios-armv6 cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv6/ if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then @@ -130,8 +130,7 @@ if [ "$CROSSCOMPILE_IOS_ARMV7" = "true" ]; then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv7 cd $COMPILEDIR/crosscompile/ios-armv7 - - $SCRIPT crosscompile ios-armv7 + PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/:$PATH" $SCRIPT crosscompile ios-armv7 cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv7/ if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then