diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-10-29 19:05:32 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-11-03 20:14:59 -0400 |
| commit | 37c380735451294f0874cdd160620add2d6f56d8 (patch) | |
| tree | 01dc85c59a8f5f4ee9008dae48011120d27ae0c4 | |
| parent | 1a6402861c6e655f35e1b048a5ac5a3df1f460cb (diff) | |
| download | haskell-37c380735451294f0874cdd160620add2d6f56d8.tar.gz | |
hadrian: Don't pass empty paths via -I
Previously we could in some cases add empty paths to `cc`'s include file
search path. See #20578.
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 36fcbb228a..6506d1ebe1 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -273,8 +273,8 @@ rtsPackageArgs = package rts ? do let cArgs = mconcat [ rtsWarnings - , flag UseSystemFfi ? arg ("-I" ++ ffiIncludeDir) - , flag WithLibdw ? arg ("-I" ++ libdwIncludeDir) + , flag UseSystemFfi ? not (null ffiIncludeDir) ? arg ("-I" ++ ffiIncludeDir) + , flag WithLibdw ? not (null libdwIncludeDir) ? arg ("-I" ++ libdwIncludeDir) , arg "-fomit-frame-pointer" -- RTS *must* be compiled with optimisations. The INLINE_HEADER macro -- requires that functions are inlined to work as expected. Inlining |