[Git][ghc/ghc][master] Hadrian: fix build on Mac OS Catalina (#17798)

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
729bcb02 by Sylvain Henry at 2020-06-18T23:04:17-04:00
Hadrian: fix build on Mac OS Catalina (#17798)

- - - - -


2 changed files:

- hadrian/src/Settings/Builders/Ghc.hs
- hadrian/src/Settings/Warnings.hs


Changes:

=====================================
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 ]


=====================================
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



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/729bcb02716593ae46d7baecce4776b3f353e3f7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/729bcb02716593ae46d7baecce4776b3f353e3f7
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200618/05a3e2e0/attachment-0001.html>