diff options
| -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 |