Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC
Commits:
-
6a2aa024
by Sven Tennie at 2026-02-25T19:34:01+00:00
-
5d7e35f3
by Sven Tennie at 2026-02-25T20:52:55+00:00
2 changed files:
Changes:
| ... | ... | @@ -17,8 +17,8 @@ import System.Directory |
| 17 | 17 | |
| 18 | 18 | initInterpOpts :: DynFlags -> IO InterpOpts
|
| 19 | 19 | initInterpOpts dflags = do
|
| 20 | - wasm_dyld <- makeAbsolute $ topDir dflags </> "dyld.mjs"
|
|
| 21 | - js_interp <- makeAbsolute $ topDir dflags </> "ghc-interp.js"
|
|
| 20 | + wasm_dyld <- makeAbsolute $ libTopDir dflags </> "dyld.mjs"
|
|
| 21 | + js_interp <- makeAbsolute $ libTopDir dflags </> "ghc-interp.js"
|
|
| 22 | 22 | pure $ InterpOpts
|
| 23 | 23 | { interpExternal = gopt Opt_ExternalInterpreter dflags
|
| 24 | 24 | , interpProg = pgm_i dflags
|
| ... | ... | @@ -469,7 +469,8 @@ generateSettings :: FilePath -> Expr String |
| 469 | 469 | generateSettings settingsFile = do
|
| 470 | 470 | ctx <- getContext
|
| 471 | 471 | stage <- getStage
|
| 472 | - isCrossStage <- expr $ crossStage stage
|
|
| 472 | + let ghcStage = predStage stage
|
|
| 473 | + isCrossStage <- expr $ crossStage ghcStage
|
|
| 473 | 474 | |
| 474 | 475 | package_db_path <- expr $ do
|
| 475 | 476 | let get_pkg_db stg = packageDbPath (PackageDbLoc stg Final)
|
| ... | ... | @@ -489,7 +490,7 @@ generateSettings settingsFile = do |
| 489 | 490 | Stage2 -> pkgUnitId Stage1 base
|
| 490 | 491 | Stage3 -> pkgUnitId Stage2 base
|
| 491 | 492 | |
| 492 | - rel_lib_topDir :: FilePath <- expr $ buildRoot <&> (-/- stageString (if isCrossStage then stage else predStage stage) -/- "lib")
|
|
| 493 | + rel_lib_topDir :: FilePath <- expr $ buildRoot <&> (-/- stageString (if isCrossStage then stage else ghcStage) -/- "lib")
|
|
| 493 | 494 | let rel_pkg_db = makeRelativeNoSysLink (dropFileName settingsFile) package_db_path
|
| 494 | 495 | make_absolute rel_path = do
|
| 495 | 496 | abs_path <- liftIO (makeAbsolute rel_path)
|