GitLab

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

Commits:

9d371d23

by Matthew Pickering at 2025-12-06T11:07:09-05:00

hadrian: Use a response file to invoke GHC for dep gathering.

In some cases we construct an argument list too long for GHC to
handle directly on windows. This happens when we generate
the dependency file because the command line will contain
references to a large number of .hs files.

To avoid this we now invoke GHC using a response file when
generating dependencies to sidestep length limitations.

Note that we only pass the actual file names in the dependency
file. Why? Because this side-steps #26560

2 changed files:

hadrian/src/Builder.hs
hadrian/src/Settings/Builders/Ghc.hs

Changes:

hadrian/src/Builder.hs

@@ -361,6 +361,12 @@ instance H.Builder Builder where
                  Haddock BuildPackage -> runHaddock path buildArgs buildInputs
 +                Ghc FindHsDependencies _ -> do
 +                  -- Use a response file for ghc -M invocations, to
 +                  -- avoid issues with command line size limit on
 +                  -- Windows (#26637)
 +                  runGhcWithResponse path buildArgs buildInputs
++
                  HsCpp    -> captureStdout
                  Make dir -> cmd' buildOptions path ["-C", dir] buildArgs
@@ -403,6 +409,17 @@ runHaddock haddockPath flagArgs fileInputs = withTempFile $ \tmp -> do
      writeFile' tmp $ escapeArgs fileInputs
      cmd [haddockPath] flagArgs ('@' : tmp)
 +runGhcWithResponse :: FilePath -> [String] -> [FilePath] -> Action ()
 +runGhcWithResponse ghcPath flagArgs fileInputs = withTempFile $ \tmp -> do
++
 +    writeFile' tmp $ escapeArgs fileInputs
++
 +    -- We can't put the flags in a response file, because some flags
 +    -- require empty arguments (such as the -dep-suffix flag), but
 +    -- that isn't supported yet due to #26560.
 +    cmd [ghcPath] flagArgs ('@' : tmp)
++
++
  -- TODO: Some builders are required only on certain platforms. For example,
  -- 'Objdump' is only required on OpenBSD and AIX. Add support for platform
  -- specific optional builders as soon as we can reliably test this feature.

hadrian/src/Settings/Builders/Ghc.hs

@@ -182,7 +182,7 @@ findHsDependencies = builder (Ghc FindHsDependencies) ? do
              , arg "-include-pkg-deps"
              , arg "-dep-makefile", arg =<< getOutput
              , pure $ concat [ ["-dep-suffix", wayPrefix w] | w <- Set.toList ways ]
 -            , getInputs ]
 +            ]
  haddockGhcArgs :: Args
  haddockGhcArgs = mconcat [ commonGhcArgs