Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC
Commits:
-
b7170645
by Sven Tennie at 2026-05-31T14:28:02+02:00
1 changed file:
Changes:
| ... | ... | @@ -271,7 +271,11 @@ generateRules = do |
| 271 | 271 | pkgDb <- get_pkg_db libStage
|
| 272 | 272 | -- addTrailingPathSeparator needed: makeRelativeNoSysLink uses
|
| 273 | 273 | -- splitPath where "lib" and "lib/" are distinct components.
|
| 274 | - let libTopDir = addTrailingPathSeparator (root -/- stageString libStage -/- "lib")
|
|
| 274 | + isCrossLibDir <- crossStage stage
|
|
| 275 | + let libTopDir = addTrailingPathSeparator $
|
|
| 276 | + if isCrossLibDir
|
|
| 277 | + then root -/- stageString stage' -/- "lib"
|
|
| 278 | + else prefix
|
|
| 275 | 279 | relPkgDb = makeRelativeNoSysLink libTopDir pkgDb
|
| 276 | 280 | go (generateSettings out True relPkgDb) out
|
| 277 | 281 | (prefix -/- "targets" -/- "default.target") %> \out -> go (show <$> expr (targetStage (succStage stage))) out
|