[commit: ghc] master: Adds mingw64 to the valid GHC OSs. (abca29f)

git at git.haskell.org git at git.haskell.org
Mon Sep 25 23:21:22 UTC 2017


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

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

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

commit abca29f3f3e19c4af452c1714be1bf33f4ac9180
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Sep 26 00:19:06 2017 +0100

    Adds mingw64 to the valid GHC OSs.
    
    Summary:
    This fixes hadrian#420 (https://github.com/snowleopard/hadrian/issues/420)
    
    specifically the "Unknown OS mingw64".
    
    Reviewers: austin, hvr, bgamari, Phyx
    
    Reviewed By: Phyx
    
    Subscribers: rwbarton, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D4016


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

abca29f3f3e19c4af452c1714be1bf33f4ac9180
 aclocal.m4 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 754a13a..af84b6f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1899,6 +1899,10 @@ AC_DEFUN([GHC_LLVM_TARGET], [
       llvm_target_vendor="unknown"
       llvm_target_os="$3""hf"
       ;;
+    *-mingw32|*-mingw64)
+      llvm_target_vendor="unknown"
+      llvm_target_os="windows"
+      ;;
     *)
       GHC_CONVERT_VENDOR([$2],[llvm_target_vendor])
       GHC_CONVERT_OS([$3],[$1],[llvm_target_os])



More information about the ghc-commits mailing list