[commit: ghc] master: GHC_LLVM_TARGET: Keep android OS (07ddeaf)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/07ddeaf7ea0d12c3e1f1be54ed19fdb3d9bf96b7/ghc

>---------------------------------------------------------------

commit 07ddeaf7ea0d12c3e1f1be54ed19fdb3d9bf96b7
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Sep 27 09:20:31 2017 +0800

    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


>---------------------------------------------------------------

07ddeaf7ea0d12c3e1f1be54ed19fdb3d9bf96b7
 aclocal.m4 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index c89ef0d..5425408 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])