diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-09-27 09:20:31 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2017-09-27 16:31:35 +0800 |
| commit | 07ddeaf7ea0d12c3e1f1be54ed19fdb3d9bf96b7 (patch) | |
| tree | 60903b0f87d68434dcb6bd2c59a4078be6f2da66 /aclocal.m4 | |
| parent | 1421d87c8aabd7b1934f60bef688939882c8251c (diff) | |
| download | haskell-07ddeaf7ea0d12c3e1f1be54ed19fdb3d9bf96b7.tar.gz | |
GHC_LLVM_TARGET: Keep android OS
Summary:
Our usual GHC_CONVERT_OS macro, will turn any andoird* into android.
This however drops the essential androideabi part. As such for the
GHC_LLVM_TARGET we only convert the VENDOR, not the OS.
Reviewers: bgamari, austin, hvr
Reviewed By: bgamari
Subscribers: rwbarton, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D4031
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c89ef0d40d..5425408c88 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1903,6 +1903,14 @@ 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*) + GHC_CONVERT_VENDOR([$2],[llvm_target_vendor]) + llvm_target_os="$3" + ;; *) GHC_CONVERT_VENDOR([$2],[llvm_target_vendor]) GHC_CONVERT_OS([$3],[$1],[llvm_target_os]) |