[Git][ghc/ghc][wip/toolchain-selection] Tweaks

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
2adee668 by Rodrigo Mesquita at 2023-05-30T09:47:50+01:00
Tweaks

- - - - -


2 changed files:

- hadrian/src/Builder.hs
- utils/ghc-toolchain/src/GHC/Toolchain/Monad.hs


Changes:

=====================================
hadrian/src/Builder.hs
=====================================
@@ -433,7 +433,7 @@ systemBuilderPath builder = case builder of
     Ghc _  (Stage0 {})   -> fromKey "system-ghc"
     GhcPkg _ (Stage0 {}) -> fromKey "system-ghc-pkg"
     Happy           -> fromKey "happy"
-    HsCpp           -> fromKey "hs-cpp"
+    HsCpp           -> fromTargetTC "hs-cpp" (Toolchain.hsCppProgram . tgtHsCPreprocessor)
     Ld _            -> fromTargetTC "ld" (Toolchain.ccLinkProgram . tgtCCompilerLink)
     -- MergeObjects Stage0 is a special case in case of
     -- cross-compiling. We're building stage1, e.g. code which will be


=====================================
utils/ghc-toolchain/src/GHC/Toolchain/Monad.hs
=====================================
@@ -53,7 +53,7 @@ getEnv :: M Env
 getEnv = M $ lift Reader.ask
 
 makeM :: IO (Either [Error] a) -> M a
-makeM io = M (Except.ExceptT (Reader.ReaderT (\env -> io)))
+makeM io = M (Except.ExceptT (Reader.ReaderT (\_env -> io)))
 
 data Error = Error { errorMessage :: String
                    , errorLogContexts :: [String]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2adee66879754dcc9308f5c8b4ee751afc2af3bc

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2adee66879754dcc9308f5c8b4ee751afc2af3bc
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/20230530/7f351ca3/attachment-0001.html>