[Git][ghc/ghc][wip/toolchain-selection] 2 commits: prettier comment

[Rodrigo Mesquita (@alt-romes)]

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


Commits:
ada2d27e by Rodrigo Mesquita at 2023-07-10T16:29:39+01:00
prettier comment

- - - - -
843e5842 by Rodrigo Mesquita at 2023-07-10T17:14:36+01:00
fixup! Configure Host toolchain with dummy options, hope they aren't used

- - - - -


2 changed files:

- hadrian/cfg/system.config.in
- hadrian/src/Oracles/Setting.hs


Changes:

=====================================
hadrian/cfg/system.config.in
=====================================
@@ -48,6 +48,8 @@ ghc-source-path      = @hardtop@
 # Q: What is TargetPlatformFull?
 target-platform-full  = @TargetPlatformFull@
 
+cross-compiling       = @CrossCompiling@
+
 dynamic-extension     = @soext_target@
 
 ghc-version           = @GhcVersion@


=====================================
hadrian/src/Oracles/Setting.hs
=====================================
@@ -256,11 +256,12 @@ libsuf st way
         return (suffix ++ "-ghc" ++ version ++ extension)
 
 targetStage :: Stage -> Action Target
--- TODO: We currently only support cross-compiling a stage1 compiler,
--- but the cross compiler should really be stage2 (#19174)
+-- TODO(#19174):
+-- We currently only support cross-compiling a stage1 compiler,
+-- but the cross compiler should really be stage2 (#19174).
 -- When we get there, we'll need to change the definition here.
-targetStage (Stage0 {}) = getHostTarget   -- getBuildTarget
-targetStage (Stage1 {}) = getTargetTarget -- getHostTarget
-targetStage (Stage2 {}) = getTargetTarget -- getTargetTarget
-targetStage (Stage3 {}) = getTargetTarget -- Would only be available for runnable stage2s?
+targetStage (Stage0 {}) = getHostTarget
+targetStage (Stage1 {}) = getTargetTarget
+targetStage (Stage2 {}) = getTargetTarget -- the last two only make sense if the target can be executed locally
+targetStage (Stage3 {}) = getTargetTarget
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7e33bddd38b703169525d9b46d16230ba838cd6e...843e5842b0bdf6bf522795b06f746237e33a1664

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7e33bddd38b703169525d9b46d16230ba838cd6e...843e5842b0bdf6bf522795b06f746237e33a1664
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/20230710/72c9cc8f/attachment-0001.html>