GitLab

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

Commits:

3d5a1365

by Cheng Shao at 2026-01-22T08:59:28-05:00

hadrian: add missing notCross predicate for stage0 -O0

There are a few hard-coded hadrian args that pass -O0 when compiling
some heavy modules in stage0, which only makes sense when not
cross-compiling and when cross-compiling we need properly optimized
stage0 packages. So this patch adds the missing `notCross` predicate
in those places.

1 changed file:

hadrian/src/Settings/Packages.hs

Changes:

hadrian/src/Settings/Packages.hs

@@ -53,7 +53,7 @@ packageArgs = do
          -- for Stage0 only so we can link ghc-pkg against it, so there is little
          -- reason to spend the effort to optimise it.
          , package cabal ?
 -          stage0 ? builder Ghc ? arg "-O0"
 +          andM [stage0, notCross] ? builder Ghc ? arg "-O0"
          ------------------------------- compiler -------------------------------
          , package compiler ? mconcat
@@ -71,7 +71,7 @@ packageArgs = do
              -- These files take a very long time to compile with -O1,
              -- so we use -O0 for them just in Stage0 to speed up the
              -- build but not affect Stage1+ executables
 -            , inputs ["**/GHC/Hs/Instances.hs", "**/GHC/Driver/Session.hs"] ? stage0 ?
 +            , inputs ["**/GHC/Hs/Instances.hs", "**/GHC/Driver/Session.hs"] ? andM [stage0, notCross] ?
                pure ["-O0"] ]
            , builder (Cabal Setup) ? mconcat