[Git][ghc/ghc][wip/hadrian-windows-bindist] another attempt

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-windows-bindist at Glasgow Haskell Compiler / GHC


Commits:
0ae25455 by Matthew Pickering at 2023-08-14T14:28:14+01:00
another attempt

- - - - -


4 changed files:

- configure.ac
- distrib/configure.ac.in
- m4/fp_settings.m4
- m4/fp_setup_windows_toolchain.m4


Changes:

=====================================
configure.ac
=====================================
@@ -326,7 +326,7 @@ FP_FIND_ROOT
 # Extract and configure the Windows toolchain
 if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
     FP_INSTALL_WINDOWS_TOOLCHAIN
-    FP_SETUP_WINDOWS_TOOLCHAIN(["$hardtop/inplace/mingw"])
+    FP_SETUP_WINDOWS_TOOLCHAIN(["$hardtop/inplace/mingw"], ["$hardtop/inplace/mingw"])
 else
     AC_PATH_TOOL([CC],[gcc], [clang])
     AC_PATH_TOOL([CXX],[g++], [clang++])


=====================================
distrib/configure.ac.in
=====================================
@@ -104,7 +104,7 @@ AC_ARG_ENABLE(distro-toolchain,
 )
 
 if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
-  FP_SETUP_WINDOWS_TOOLCHAIN(["$$topdir/../mingw/"])
+  FP_SETUP_WINDOWS_TOOLCHAIN(["$hardtop/inplace/mingw/"], ["$$topdir/../mingw/])
 fi
 
 dnl ** Which gcc to use?


=====================================
m4/fp_settings.m4
=====================================
@@ -42,8 +42,8 @@ dnl ghc-toolchain.
 # See Note [How we configure the bundled windows toolchain]
 AC_DEFUN([SUBST_TOOLDIR],
 [
-#    dnl and Note [How we configure the bundled windows toolchain]
-#    $1=`echo $$1 | sed 's%'"$mingwpath"'%$$tooldir/mingw%'`
+    dnl and Note [How we configure the bundled windows toolchain]
+    $1=`echo $$1 | sed 's%'"$mingw_prefix"'%$mingw_install_prefix%'`
 ])
 
 # FP_SETTINGS


=====================================
m4/fp_setup_windows_toolchain.m4
=====================================
@@ -76,7 +76,8 @@ AC_DEFUN([FP_INSTALL_WINDOWS_TOOLCHAIN],[
 ])
 
 # Set up the environment variables
-# $1 the location that the windows toolchain will be installed in relative to the libdir
+# The actual location of the windows toolchain (before install)
+# $2 the location that the windows toolchain will be installed in relative to the libdir
 AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
 
     # N.B. The parameters which get plopped in the `settings` file used by the
@@ -85,6 +86,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
     # occurrences of $hardtop/inplace/mingw with $$tooldir/mingw
 
     mingw_prefix="$1"
+    mingw_install_prefix="$2"
 #    mingwpath="$hardtop/inplace/mingw"
 
     # Our Windows toolchain is based around Clang and LLD. We use compiler-rt



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0ae25455993da7d04e41d703c2cf14470dc7e69a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0ae25455993da7d04e41d703c2cf14470dc7e69a
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230814/93b8862a/attachment-0001.html>