diff options
Diffstat (limited to 'scripts/prepare-ctemplate-ios.sh')
-rwxr-xr-x | scripts/prepare-ctemplate-ios.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh index 3b6c0e0b..d23c10fd 100755 --- a/scripts/prepare-ctemplate-ios.sh +++ b/scripts/prepare-ctemplate-ios.sh @@ -49,7 +49,7 @@ else cd ctemplate fi version=`git rev-parse HEAD | cut -c1-10` -build_version="$version~1" +build_version="$version~2" if test -f "$resultdir/ctemplate-ios-$build_version.zip" ; then echo install from cache @@ -71,12 +71,12 @@ cp -R "$builddir/downloads/ctemplate" "$srcdir/ctemplate" echo building ctemplate cd "$srcdir/ctemplate" -TOOLCHAIN=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin +TOOLCHAIN=`xcode-select -p`/Toolchains/XcodeDefault.xctoolchain/usr/bin export CC=$TOOLCHAIN/clang export CXX=$TOOLCHAIN/clang++ sdk="iphoneos$sdkversion" -sysroot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk" +sysroot="`xcode-select -p`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk" ARCH=arm for MARCH in $MARCHS; do @@ -84,8 +84,8 @@ for MARCH in $MARCHS; do echo "$logdir/ctemplate-build.log" export CPPFLAGS="-arch ${MARCH} -isysroot $sysroot -miphoneos-version-min=$sdkversion" export CFLAGS="$CPPFLAGS" - export CXXFLAGS="$CFLAGS -stdlib=libstdc++ -std=gnu++11" - export LDFLAGS="-lstdc++ -stdlib=libstdc++" + export CXXFLAGS="$CFLAGS -stdlib=libc++" + export LDFLAGS="-lstdc++ -stdlib=libc++" ./configure --host=${ARCH} --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log" make >> "$logdir/ctemplate-build.log" @@ -105,7 +105,7 @@ for MARCH in $MARCHS; do done sdk="iphonesimulator$sdkversion" -sysroot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$sdkversion.sdk" +sysroot="`xcode-select -p`/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$sdkversion.sdk" ARCH=i386 MARCHS="i386 x86_64" @@ -115,8 +115,8 @@ for MARCH in $MARCHS; do echo "$logdir/ctemplate-build.log" export CPPFLAGS="-arch ${MARCH} -isysroot $sysroot -miphoneos-version-min=$sdkversion" export CFLAGS="$CPPFLAGS" - export CXXFLAGS="$CFLAGS -stdlib=libstdc++ -std=gnu++11" - export LDFLAGS="-lstdc++ -stdlib=libstdc++" + export CXXFLAGS="$CFLAGS -stdlib=libc++" + export LDFLAGS="-lstdc++ -stdlib=libc++" ./configure --host=${MARCH} --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log" make >> "$logdir/ctemplate-build.log" |