[configure] Clean up target name matching for $host != $target case.
authorAlex Rønne Petersen <alexrp@xamarin.com>
Tue, 7 Apr 2015 20:24:48 +0000 (22:24 +0200)
committerAlex Rønne Petersen <alexrp@xamarin.com>
Tue, 7 Apr 2015 20:25:42 +0000 (22:25 +0200)
We fully control the $target values here as we don't use canonicalization for
them. So we have no reason or excuse to be using wildcards in them.

E.g. any Linux $target in this case would previously be assumed to be Android.

configure.ac

index 7a4803a3f6977ac348689539cd73eed175bcd65c..04c47b82fad32a114a49cceb008cbd5937ce931a 100644 (file)
@@ -2955,7 +2955,7 @@ if test "x$host" != "x$target"; then
    AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode])
    enable_mcs_build=no
    case "$target" in
-   arm*-darwin*)
+   arm-darwin)
                TARGET=ARM;
                arch_target=arm;
                ACCESS_UNALIGNED="no"
@@ -3016,7 +3016,7 @@ if test "x$host" != "x$target"; then
                AC_DEFINE(TARGET_X86, 1, [...])
                sizeof_register=4
                ;;
-   arm*-linux-*)
+   armv5-linux-androideabi)
                TARGET=ARM;
                arch_target=arm;
                AC_DEFINE(TARGET_ARM, 1, [...])
@@ -3027,17 +3027,8 @@ if test "x$host" != "x$target"; then
                # in mono-compiler.h
                with_tls=pthread
                target_mach=no
-               case "$target" in
-               armv7l-unknown-linux-gnueabi*)
-                       # TEGRA
-                       CPPFLAGS="$CPPFLAGS"
-                       ;;
-               armv5-*-linux-androideabi*)
-                       CPPFLAGS="$CPPFLAGS"
-                       ;;
-               esac
                ;;
-   i686*-linux-*)
+   i686-linux-android)
                TARGET=X86;
                arch_target=x86;
                AC_DEFINE(TARGET_X86, 1, [...])
@@ -3049,7 +3040,7 @@ if test "x$host" != "x$target"; then
                with_tls=pthread
                target_mach=no
                ;;
-   x86_64*-linux-*)
+   x86_64-linux-android)
                TARGET=AMD64;
                arch_target=amd64;
                AC_DEFINE(TARGET_AMD64, 1, [...])
@@ -3073,7 +3064,7 @@ if test "x$host" != "x$target"; then
                with_tls=pthread
                target_mach=no
                ;;
-   aarch64*-linux-*)
+   aarch64-v8a-linux-android)
                TARGET=ARM64;
                arch_target=arm64;
                AC_DEFINE(TARGET_ARM64, 1, [...])
@@ -3084,8 +3075,9 @@ if test "x$host" != "x$target"; then
                with_tls=pthread
                target_mach=no
                ;;
-       aarch64-*)
-               TARGET=ARM64
+       aarch64-darwin)
+               TARGET=ARM64;
+               arch_target=arm64;
                ;;
        *)
                AC_MSG_ERROR([Cross compiling is not supported for target $target])