diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-10-29 19:05:32 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-12-20 15:21:48 -0500 |
| commit | 332eb8e2346490a27435d9f8ef58927f90b3e2bc (patch) | |
| tree | 28d021c98639cac9f751b2dc14a40eb6f81e0def | |
| parent | 36cd4dafe83ae6982fcdd2da1b1dc0db9ce99711 (diff) | |
| download | haskell-332eb8e2346490a27435d9f8ef58927f90b3e2bc.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.
(cherry picked from commit 079458495babd2ac6af383dc948d8946dedaef41)
| -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 225da5c03e..e814df7f42 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -282,8 +282,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 |