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/Settings/Builders/Common.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/Settings/Builders/Common.hs')
| -rw-r--r-- | hadrian/src/Settings/Builders/Common.hs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Builders/Common.hs b/hadrian/src/Settings/Builders/Common.hs index 4ffca988a0..ad6f5c048a 100644 --- a/hadrian/src/Settings/Builders/Common.hs +++ b/hadrian/src/Settings/Builders/Common.hs @@ -24,7 +24,6 @@ cIncludeArgs = do path <- getBuildPath incDirs <- getContextData includeDirs depDirs <- getContextData depIncludeDirs - stage <- getStage -- TODO: Why is any of this necessary? We should have already told Cabal about these paths. iconvIncludeDir <- getSetting IconvIncludeDir gmpIncludeDir <- getSetting GmpIncludeDir @@ -32,9 +31,7 @@ cIncludeArgs = do libdwIncludeDir <- getSetting LibdwIncludeDir numaIncludeDir <- getSetting LibnumaIncludeDir cursesIncludeDir <- getSetting CursesIncludeDir - libPath <- expr $ stageLibPath stage mconcat [ notStage0 ? arg "-Irts/include" - , arg $ "-I" ++ libPath , arg $ "-I" ++ path , pure . map ("-I"++) . filter (/= "") $ [iconvIncludeDir, gmpIncludeDir, numaIncludeDir, cursesIncludeDir] , flag UseSystemFfi ? if not (null ffiIncludeDir) then arg ("-I" ++ ffiIncludeDir) else mempty |