[commit: ghc] wip/nfs-locking: Pass configure Cc and Cpp options to GHC (79575b3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/79575b395e32de2ad6dec3bf4e11d30767779ee6/ghc

>---------------------------------------------------------------

commit 79575b395e32de2ad6dec3bf4e11d30767779ee6
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Oct 2 23:30:15 2016 +0100

    Pass configure Cc and Cpp options to GHC


>---------------------------------------------------------------

79575b395e32de2ad6dec3bf4e11d30767779ee6
 src/Settings/Builders/Ghc.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index 475c9b3..6eaf8ae 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -78,7 +78,8 @@ commonGhcArgs :: Args
 commonGhcArgs = do
     way     <- getWay
     path    <- getBuildPath
-    hsArgs  <- getPkgDataList HsArgs
+    confCc  <- getSettingList . ConfCcArgs =<< getStage
+    confCpp <- getSettingList . ConfCppArgs =<< getStage
     cppArgs <- getPkgDataList CppArgs
     mconcat [ arg "-hisuf", arg $ hisuf way
             , arg "-osuf" , arg $  osuf way
@@ -86,7 +87,9 @@ commonGhcArgs = do
             , wayGhcArgs
             , packageGhcArgs
             , includeGhcArgs
-            , append hsArgs
+            , append =<< getPkgDataList HsArgs
+            , append $ map ("-optc" ++) confCc
+            , append $ map ("-optP" ++) confCpp
             , append $ map ("-optP" ++) cppArgs
             , arg "-odir"    , arg path
             , arg "-hidir"   , arg path