Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: cc9810d4 by Sven Tennie at 2025-09-21T16:34:19+02:00 Fix libffi ghcjs - - - - - 3 changed files: - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Register.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -54,7 +54,7 @@ ghcInternalDependencies = do rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath - jsTarget <- staged isJsTarget + jsTarget <- succStaged isJsTarget useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget (succStage stage) + jsTarget <- isJsTarget stage if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Register.hs ===================================== @@ -150,7 +150,7 @@ buildConfFinal rs context@Context {..} _conf = do -- Special package cases (these should ideally be rolled into Cabal). when (package == rts) $ do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- If Cabal knew about "generated-headers", we could read them from the -- 'configuredCabal' information, and just "need" them here. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc9810d49b30cd00ab725c6dfbd74c5b... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc9810d49b30cd00ab725c6dfbd74c5b... You're receiving this email because of your account on gitlab.haskell.org.