[Git][ghc/ghc][wip/ghc-toolchain-fixes] 2 commits: fix build

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ghc-toolchain-fixes at Glasgow Haskell Compiler / GHC


Commits:
7adaecdf by Matthew Pickering at 2023-08-08T13:31:18+01:00
fix build

- - - - -
7e383094 by Matthew Pickering at 2023-08-08T13:31:25+01:00
trace

- - - - -


2 changed files:

- compiler/GHC/SysTools/Cpp.hs
- utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs


Changes:

=====================================
compiler/GHC/SysTools/Cpp.hs
=====================================
@@ -37,7 +37,6 @@ import Data.Maybe
 import Control.Monad
 
 import System.Directory
-import System.FilePath
 
 data CppOpts = CppOpts
   { useHsCpp       :: !Bool


=====================================
utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs
=====================================
@@ -38,8 +38,8 @@ findHsCppArgs :: Program -> M [String]
 findHsCppArgs cpp = do
 
   (_, stdout0, stderr0) <- readProgram cpp ["-x", "c", "/dev/null", "-dM", "-E"]
-  liftIO $ print stdout0
-  liftIO $ print stderr0
+  logDebug stdout0
+  logDebug stderr0
 
   if "__clang__" `isInfixOf` stdout0 || "__clang__" `isInfixOf` stderr0
      then return ["-undef", "-traditional", "-Wno-invalid-pp-token", "-Wno-unicode", "-Wno-trigraphs"]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/57d44cf3f1acb695444c38d79162822f278f1946...7e3830947d3d8d81c424a8dc88833cbf9d1274fd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/57d44cf3f1acb695444c38d79162822f278f1946...7e3830947d3d8d81c424a8dc88833cbf9d1274fd
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/20230808/fdc38130/attachment-0001.html>