Revert "contrib: don't stip the arch from {HOST}"

This reverts commit fbfaa42af10a1dc78aa4e9cf2c21e26f19519ab1.

diff --git a/contrib/bootstrap b/contrib/bootstrap
index de77a34b57b224d969d83f24861458f5fcc9ed12..9266fd6621a988f1c9f37d3422765415d3e62a4f 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -188,7 +188,8 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 #
 # Checks
 #
-case "${HOST}" in
+OS="${HOST#*-}" # strip architecture
+case "${OS}" in
        arm-apple-darwin*)
                check_ios_sdk
                add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
@@ -204,7 +205,7 @@ case "${HOST}" in
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
-       *linux-androideabi)
+       linux-androideabi)
                check_android_sdk
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
                add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"