[Git][ghc/ghc][wip/toolchain-selection] 2 commits: dont validate ghc-toolchain host

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
c8e21124 by Rodrigo Mesquita at 2023-07-11T11:42:15+01:00
dont validate ghc-toolchain host

- - - - -
a78b4dcd by Rodrigo Mesquita at 2023-07-11T12:00:19+01:00
fixup! Windows builtin toolchain

- - - - -


4 changed files:

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


Changes:

=====================================
configure.ac
=====================================
@@ -1299,6 +1299,17 @@ For more information on how to configure your GHC build, see
    https://gitlab.haskell.org/ghc/ghc/wikis/building
 "]
 
-VALIDATE_GHC_TOOLCHAIN([default.host.target],[default.ghc-toolchain.host.target])
+# Currently we don't validate the /host/ GHC toolchain because configure
+# doesn't configure flags and properties for most of the host toolchain
+#
+# In fact, most values in default.host.target are dummy values since they are
+# never used (see default.host.target.in)
+#
+# When we move to configure toolchains by means of ghc-toolchain only, we'll
+# have a correct complete /host/ toolchain rather than an incomplete one, which
+# might further unlock things like canadian cross-compilation
+#
+# VALIDATE_GHC_TOOLCHAIN([default.host.target],[default.ghc-toolchain.host.target])
+
 VALIDATE_GHC_TOOLCHAIN([default.target],[default.ghc-toolchain.target])
 


=====================================
distrib/configure.ac.in
=====================================
@@ -313,7 +313,7 @@ checkMake380 gmake
 # Toolchain target files
 PREP_TARGET_FILE
 FIND_GHC_TOOLCHAIN
-VALIDATE_GHC_TOOLCHAIN([default.host.target],[default.ghc-toolchain.host.target])
+
 VALIDATE_GHC_TOOLCHAIN([default.target],[default.ghc-toolchain.target])
 
 echo "****************************************************"


=====================================
m4/fp_settings.m4
=====================================
@@ -6,7 +6,7 @@
 AC_DEFUN([SUBST_TOOLDIR],
 [
     dnl See Note [tooldir: How GHC finds mingw on Windows]
-    $1=`echo $1 | sed 's%'"$mingwpath"'%$$tooldir/mingw%'`
+    $1=`echo $$1 | sed 's%'"$mingwpath"'%$$tooldir/mingw%'`
 ])
 
 # FP_SETTINGS


=====================================
m4/ghc_toolchain.m4
=====================================
@@ -94,7 +94,7 @@ AC_DEFUN([FIND_GHC_TOOLCHAIN],
     echo "--ar=$AR" >> acargs
     echo "--ranlib=$RANLIB" >> acargs
     echo "--nm=$NM" >> acargs
-    echo "--merge-objs=$SettingsMergeObjectsCommand" >> acargs
+    echo "--merge-objs=$MergeObjsCmd" >> acargs
     echo "--readelf=$READELF" >> acargs
     echo "--windres=$WindresCmd" >> acargs
     echo "--dllwrap=$DllWrapCmd" >> acargs



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f8689c726a54aa1831c93ae8d195757d14a2946a...a78b4dcdd9715acfc15ae96b07e764c29c6a22af

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f8689c726a54aa1831c93ae8d195757d14a2946a...a78b4dcdd9715acfc15ae96b07e764c29c6a22af
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/20230711/8227aef6/attachment-0001.html>