diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-26 02:36:22 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-18 22:27:55 -0500 |
| commit | aed98ddaf72cc38fb570d8415cac5de9d8888818 (patch) | |
| tree | f25c5a157f27dabbef72b77c5bdc61052ea75c21 /hadrian/src/Base.hs | |
| parent | 0acbbd2021033245c2fb70e8fc8a79fcab168394 (diff) | |
| download | haskell-aed98ddaf72cc38fb570d8415cac5de9d8888818.tar.gz | |
Hadrian: bring up to date with latest make improvements
Headers should be associated with the RTS, and subject to less hacks.
The most subtle issue was that the package-grained dependencies on
generated files were being `need`ed before calculating Haskell deps, but
not before calculating C/C++ deps.
Diffstat (limited to 'hadrian/src/Base.hs')
| -rw-r--r-- | hadrian/src/Base.hs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hadrian/src/Base.hs b/hadrian/src/Base.hs index 253a436ea9..febe1ea7b2 100644 --- a/hadrian/src/Base.hs +++ b/hadrian/src/Base.hs @@ -26,7 +26,7 @@ module Base ( -- * Paths hadrianPath, configPath, configFile, sourcePath, shakeFilesDir, stageBinPath, stageLibPath, templateHscPath, - ghcBinDeps, ghcLibDeps, includesDependencies, haddockDeps, + ghcBinDeps, ghcLibDeps, haddockDeps, relativePackageDbPath, packageDbPath, packageDbStamp, mingwStamp, ) where @@ -116,12 +116,6 @@ ghcBinDeps stage = mapM (\f -> stageLibPath stage <&> (-/- f)) , "ghci-usage.txt" ] -includesDependencies :: Stage -> Action [FilePath] -includesDependencies stage = do - p <- stageLibPath stage - pure $ (p -/-) <$> - [ "ghcautoconf.h", "ghcplatform.h" ] - -- | Files the `haddock` binary depends on haddockDeps :: Stage -> Action [FilePath] haddockDeps stage = do |