diff options
-rw-r--r-- | aclocal.m4 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 3e240eaaaa..b665615dba 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2084,14 +2084,6 @@ AC_DEFUN([GHC_LLVM_TARGET], [ llvm_target_vendor="unknown" llvm_target_os="windows" ;; - # retain any android and gnueabi linux flavours - # for the LLVM Target. Otherwise these would be - # turned into just `-linux` and fail to be found - # in the `llvm-targets` file. - *-android*|*-gnueabi*|*-musleabi*) - GHC_CONVERT_VENDOR([$3],[llvm_target_vendor]) - llvm_target_os="$4" - ;; # apple is a bit about their naming scheme for # aarch64; and clang on macOS doesn't know that # aarch64 would be arm64. So for LLVM we'll need @@ -2107,6 +2099,16 @@ AC_DEFUN([GHC_LLVM_TARGET], [ GHC_CONVERT_OS([$4],[$2],[llvm_target_os]) ;; esac + case "$4" in + # retain any android and gnueabi linux flavours + # for the LLVM Target. Otherwise these would be + # turned into just `-linux` and fail to be found + # in the `llvm-targets` file. + *-android*|*-gnueabi*|*-musleabi*) + GHC_CONVERT_VENDOR([$3],[llvm_target_vendor]) + llvm_target_os="$4" + ;; + esac $5="$llvm_target_cpu-$llvm_target_vendor-$llvm_target_os" ]) |