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 Fix LibDir - - - - - 1 changed file: - hadrian/src/Rules/Generate.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -271,7 +271,11 @@ generateRules = do pkgDb <- get_pkg_db libStage -- addTrailingPathSeparator needed: makeRelativeNoSysLink uses -- splitPath where "lib" and "lib/" are distinct components. - let libTopDir = addTrailingPathSeparator (root -/- stageString libStage -/- "lib") + isCrossLibDir <- crossStage stage + let libTopDir = addTrailingPathSeparator $ + if isCrossLibDir + then root -/- stageString stage' -/- "lib" + else prefix relPkgDb = makeRelativeNoSysLink libTopDir pkgDb go (generateSettings out True relPkgDb) out (prefix -/- "targets" -/- "default.target") %> \out -> go (show <$> expr (targetStage (succStage stage))) out View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b7170645641ee26bdfe3569de358ce47... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b7170645641ee26bdfe3569de358ce47... You're receiving this email because of your account on gitlab.haskell.org.