[commit: ghc] ghc-8.2: aclocal.m4: treat '*-w64-mingw32' targets as windows (9fa02be)

git at git.haskell.org git at git.haskell.org
Thu Apr 27 20:09:56 UTC 2017


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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/9fa02bebfb0636160610dbef217ba03419cf004e/ghc

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

commit 9fa02bebfb0636160610dbef217ba03419cf004e
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sun Apr 23 11:25:29 2017 +0100

    aclocal.m4: treat '*-w64-mingw32' targets as windows
    
    Noticed when tried to cross-compile GHC from x86_64-linux
    to --target=i686-w64-mingw32. Final ghc executables did
    not have '.exe' extensions.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit fe37e2c6ab9dae6a522735114fea4dde9509250f)


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

9fa02bebfb0636160610dbef217ba03419cf004e
 aclocal.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 2062b0d..fa32b6d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -14,7 +14,8 @@ AC_DEFUN([GHC_SELECT_FILE_EXTENSIONS],
         AC_MSG_WARN([I'm assuming you wanted to build for i386-unknown-mingw32])
         exit 1
         ;;
-    *-unknown-mingw32)
+    # examples: i386-unknown-mingw32, i686-w64-mingw32, x86_64-w64-mingw32
+    *-mingw32)
         windows=YES
         $2='.exe'
         $3='.dll'



More information about the ghc-commits mailing list