diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-06-08 19:50:06 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-18 23:04:17 -0400 |
| commit | 729bcb02716593ae46d7baecce4776b3f353e3f7 (patch) | |
| tree | 57c626a5eccff522477134b28d65da41c6753e7f | |
| parent | 1a3f6f348004a80d3d7add81b22e4217b648b145 (diff) | |
| download | haskell-729bcb02716593ae46d7baecce4776b3f353e3f7.tar.gz | |
Hadrian: fix build on Mac OS Catalina (#17798)
| -rw-r--r-- | hadrian/src/Settings/Builders/Ghc.hs | 1 | ||||
| -rw-r--r-- | hadrian/src/Settings/Warnings.hs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs index 91e0f3d288..26ebffc326 100644 --- a/hadrian/src/Settings/Builders/Ghc.hs +++ b/hadrian/src/Settings/Builders/Ghc.hs @@ -153,6 +153,7 @@ findHsDependencies = builder (Ghc FindHsDependencies) ? do , ghcVersion > [8,9,0] ? arg "-include-cpp-deps" , commonGhcArgs + , defaultGhcWarningsArgs , arg "-include-pkg-deps" , arg "-dep-makefile", arg =<< getOutput , pure $ concat [ ["-dep-suffix", wayPrefix w] | w <- ways ] diff --git a/hadrian/src/Settings/Warnings.hs b/hadrian/src/Settings/Warnings.hs index 717443ca19..4001b8bd91 100644 --- a/hadrian/src/Settings/Warnings.hs +++ b/hadrian/src/Settings/Warnings.hs @@ -11,7 +11,9 @@ defaultGhcWarningsArgs :: Args defaultGhcWarningsArgs = mconcat [ notStage0 ? arg "-Wnoncanonical-monad-instances" , notM (flag CcLlvmBackend) ? arg "-optc-Wno-error=inline" - , flag CcLlvmBackend ? arg "-optc-Wno-unknown-pragmas" ] + , flag CcLlvmBackend ? arg "-optc-Wno-unknown-pragmas" + , arg "-optP-Wno-nonportable-include-path" -- #17798 + ] -- | Package-specific warnings-related arguments, mostly suppressing various warnings. ghcWarningsArgs :: Args |