[Git][ghc/ghc][wip/hadrian-cross-stage2] 2 commits: Fix hardcoded stage1

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
31aac127 by Matthew Pickering at 2024-09-26T21:32:17+01:00
Fix hardcoded stage1

- - - - -
c2f63c36 by Matthew Pickering at 2024-09-26T21:33:48+01:00
Don't recache

- - - - -


1 changed file:

- hadrian/src/Rules/BinaryDist.hs


Changes:

=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -153,9 +153,9 @@ buildBinDistDir root conf at BindistConfig{..} = do
 
     version        <- setting ProjectVersion
     targetPlatform <- setting TargetPlatformFull
-    distDir        <- Context.distDir (vanillaContext Stage1 rts)
+    distDir        <- Context.distDir (vanillaContext library_stage rts)
 
-    let ghcBuildDir      = root -/- stageString Stage1
+    let ghcBuildDir      = root -/- stageString library_stage
         bindistFilesDir  = root -/- "bindist" -/- ghcVersionPretty
         ghcVersionPretty = "ghc-" ++ version ++ "-" ++ targetPlatform
         rtsIncludeDir    = distDir -/- "include"
@@ -227,8 +227,8 @@ buildBinDistDir root conf at BindistConfig{..} = do
     -- (c.f. #20267).
 
     -- Not going to work for cross
-    ghcPkgName <- programName (vanillaContext Stage1 ghcPkg)
-    cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"]
+    --ghcPkgName <- programName (vanillaContext Stage1 ghcPkg)
+    --cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"]
 
 
     need ["docs"]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e608df5ced6b207e9422f1401b139bf4f505e3f7...c2f63c368b6400753b80bef1da4a0e587757f2fe

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e608df5ced6b207e9422f1401b139bf4f505e3f7...c2f63c368b6400753b80bef1da4a0e587757f2fe
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/20240926/91a11991/attachment-0001.html>