Match arm64 wildcard in setenv-android.sh

noloader · noloader · commit ccb3e869eddd · 2020-03-26T12:43:57.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -601,7 +601,7 @@ before_install:
     fi
     # Clang 7 compiler is completely broken on PPC64 and s390x
     if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]] || [[ "$TRAVIS_CPU_ARCH" == "s390x" ]]; then
-        if [[ "$BUILD_OS" == "linux" ]] && [[ "$TRAVIS_COMPILER" == "clang" ]]; then
+        if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_COMPILER" == "clang" ]]; then
             # https://github.com/travis-ci/travis-ci/issues/9037
             sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
             sudo apt-get -qq -y install --no-install-recommends clang-8
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh
@@ -123,7 +123,7 @@ case "$THE_ARCH" in
 
     ANDROID_CXXFLAGS="-march=armv7-a -mthumb -mfloat-abi=softfp -funwind-tables -fexceptions -frtti"
     ;;
-  armv8*|aarch64|arm64)
+  armv8*|aarch64|arm64*)
     CC="aarch64-linux-android$ANDROID_API-clang"
     CXX="aarch64-linux-android$ANDROID_API-clang++"
     LD="aarch64-linux-android-ld"
