diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-12-01 12:37:45 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-25 10:18:17 -0400 |
| commit | 53cc93ae3c9b939fff8407ee588dff89f7f92a12 (patch) | |
| tree | 189545fd9815982bf417ecc1ea242a73555c5ce6 | |
| parent | 0950e2c49c96465ee1e82a073a88f6fecd20ccde (diff) | |
| download | haskell-53cc93ae3c9b939fff8407ee588dff89f7f92a12.tar.gz | |
hadrian: Drop redundant include directories
The package-specific include directories in
Settings.Builders.Common.cIncludeDirs are now redundant since they now
come from Cabal.
Closes #20566.
| -rw-r--r-- | hadrian/src/Settings/Builders/Common.hs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hadrian/src/Settings/Builders/Common.hs b/hadrian/src/Settings/Builders/Common.hs index 54f4105529..a011cb0dae 100644 --- a/hadrian/src/Settings/Builders/Common.hs +++ b/hadrian/src/Settings/Builders/Common.hs @@ -24,18 +24,8 @@ cIncludeArgs = do path <- getBuildPath incDirs <- getContextData includeDirs depDirs <- getContextData depIncludeDirs - -- TODO: Why is any of this necessary? We should have already told Cabal about these paths. - iconvIncludeDir <- getSetting IconvIncludeDir - gmpIncludeDir <- getSetting GmpIncludeDir - ffiIncludeDir <- getSetting FfiIncludeDir - libdwIncludeDir <- getSetting LibdwIncludeDir - numaIncludeDir <- getSetting LibnumaIncludeDir - cursesIncludeDir <- getSetting CursesIncludeDir mconcat [ notStage0 ? arg "-Irts/include" , arg $ "-I" ++ path - , pure . map ("-I"++) . filter (/= "") $ [iconvIncludeDir, gmpIncludeDir, numaIncludeDir, cursesIncludeDir] - , flag UseSystemFfi ? if not (null ffiIncludeDir) then arg ("-I" ++ ffiIncludeDir) else mempty - , flag WithLibdw ? if not (null libdwIncludeDir) then arg ("-I" ++ libdwIncludeDir) else mempty -- Add @incDirs@ in the build directory, since some files generated -- with @autoconf@ may end up in the build directory. , pure [ "-I" ++ path -/- dir | dir <- incDirs ] |