[Git][ghc/ghc][master] 2 commits: configure: Set LD_STAGE0 appropiately when 9.10.1 is used as a boot compiler

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
564981bd by Matthew Pickering at 2024-07-05T07:35:29-04:00
configure: Set LD_STAGE0 appropiately when 9.10.1 is used as a boot compiler

In 9.10.1 the "ld command" has been removed, so we fall back to using
the more precise "merge objects command" when it's available as
LD_STAGE0 is only used to set the object merging command in hadrian.

Fixes #24949

- - - - -
a949c792 by Matthew Pickering at 2024-07-05T07:35:29-04:00
hadrian: Don't build ghci object files for ./hadrian/ghci target

There is some convoluted logic which determines whether we build ghci
object files are not. In any case, if you set `ghcDynPrograms = pure
False` then it forces them to be built.

Given we aren't ever building executables with this flavour it's fine
to leave `ghcDynPrograms` as the default and it should be a bit faster
to build less.

Also fixes #24949

- - - - -


2 changed files:

- configure.ac
- hadrian/src/Settings/Flavours/GhcInGhci.hs


Changes:

=====================================
configure.ac
=====================================
@@ -176,6 +176,12 @@ if test "$WithGhc" != ""; then
 
   if test -z "$LD_STAGE0"; then
     BOOTSTRAPPING_GHC_INFO_FIELD([LD_STAGE0],[ld command])
+    # ld command is removed in 9.10.1 as a boot compiler and supplies "Merge objects
+    # command" instead
+    if test -z "$LD_STAGE0"; then
+      BOOTSTRAPPING_GHC_INFO_FIELD([LD_STAGE0],[Merge objects command])
+    fi
+
   fi
   if test -z "$AR_STAGE0"; then
     BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command])


=====================================
hadrian/src/Settings/Flavours/GhcInGhci.hs
=====================================
@@ -17,7 +17,7 @@ ghcInGhciFlavour = defaultFlavour
     -- checking for Windows seems simpler for now.
     , libraryWays = pure (Set.fromList [vanilla]) <> pure (Set.fromList [ dynamic | not windowsHost ])
     , rtsWays     = pure (Set.fromList [vanilla]) <> (targetSupportsThreadedRts ? pure (Set.fromList [threaded])) <> pure (Set.fromList [ dynamic | not windowsHost ])
-    , dynamicGhcPrograms = return False }
+    }
 
 ghciArgs :: Args
 ghciArgs = sourceArgs SourceArgs



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fab13100f23dd0fc231c0e8fe8faf237b7d1bbcc...a949c792388b5662dd199497541f9ad51c78d1a8

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fab13100f23dd0fc231c0e8fe8faf237b7d1bbcc...a949c792388b5662dd199497541f9ad51c78d1a8
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/20240705/8d42424d/attachment-0001.html>