diff options
| author | Simon Warta <[email protected]> | 2015-10-16 12:12:49 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-10-16 12:12:49 +0200 |
| commit | f257cb324614adb5f9266ca185ab2bfeb64b1dd4 (patch) | |
| tree | ebc1e2bea4a77f194dbd69f8d76d44df52336e09 /src/scripts | |
| parent | be33a49c734b5b83cbf64fa132c062ba8643bbe1 (diff) | |
| parent | db96431235190ebe7ec50ddbc73d3a05e4e712d0 (diff) | |
Merge pull request #298 from tiwoc/arm64
Support for 64 bit ARM
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index e1ced58d3..369450091 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -23,7 +23,7 @@ if [ "$CXX" = "g++" ]; then export CXX="/usr/bin/g++-4.8" fi -#enable ccache +# enable ccache if [ "$TRAVIS_OS_NAME" = "linux" ]; then ccache --max-size=30M ccache --show-stats @@ -31,10 +31,17 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="ccache $CXX" fi -if [ "$TARGETOS" = "ios" ]; then +# configure +if [ "$TARGETOS" = "ios32" ]; then ./configure.py "${CFG_FLAGS[@]}" --cpu=armv7 --cc=clang \ - --cc-abi-flags="-arch armv7 -arch armv7s -stdlib=libc++ --sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/" \ + --cc-abi-flags="-arch armv7 -arch armv7s -stdlib=libc++" \ --prefix=/tmp/botan-installation + +elif [ "$TARGETOS" = "ios64" ]; then + ./configure.py "${CFG_FLAGS[@]}" --cpu=armv8-a --cc=clang \ + --cc-abi-flags="-arch arm64 -stdlib=libc++" \ + --prefix=/tmp/botan-installation + else $CXX --version ./configure.py "${CFG_FLAGS[@]}" --cc="$CC" --cc-bin="$CXX" \ @@ -42,9 +49,14 @@ else --prefix=/tmp/botan-installation fi -make -j 2 +# build +if [ "${TARGETOS:0:3}" = "ios" ]; then + xcrun --sdk iphoneos make -j 2 +else + make -j 2 +fi -if [ "$MODULES" != "min" ] && [ "$TARGETOS" != "ios" ]; then +if [ "$MODULES" != "min" ] && [ "${TARGETOS:0:3}" != "ios" ]; then ./botan-test fi |