[Git][ghc/ghc][wip/js-staging] 2 commits: Fix rts.cabal again

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
f34c11e6 by Sylvain Henry at 2022-10-20T17:16:55+02:00
Fix rts.cabal again

- - - - -
dbcd92ec by Sylvain Henry at 2022-10-20T17:52:37+02:00
Fix invalid use of predStage

- - - - -


2 changed files:

- hadrian/src/Rules/Test.hs
- rts/rts.cabal.in


Changes:

=====================================
hadrian/src/Rules/Test.hs
=====================================
@@ -206,8 +206,9 @@ testRules = do
         -- get absolute path for the given program in stage1 (useful for
         -- cross-compilers)
         let absolute_path1
-              | cross     = absolute_path_stage (Stage0 InTreeLibs)
-              | otherwise = absolute_path_stage $ predStage stg
+              | cross            = absolute_path_stage (Stage0 InTreeLibs)
+              | Stage0 {} <- stg = absolute_path_stage stg
+              | otherwise        = absolute_path_stage $ predStage stg
 
         ghcPath <- getCompilerPath testCompilerArg
 


=====================================
rts/rts.cabal.in
=====================================
@@ -308,7 +308,7 @@ library
            "-Wl,-u,_ghczmprim_GHCziTypes_True_closure"
            "-Wl,-u,_ghczmprim_GHCziTypes_False_closure"
            "-Wl,-u,_base_GHCziPack_unpackCString_closure"
-           "-Wl,-u,_base_GHCziWeakFinalizze_runFinalizzerBatch_closure"
+           "-Wl,-u,_base_GHCziWeakziFinalizze_runFinalizzerBatch_closure"
            "-Wl,-u,_base_GHCziIOziException_stackOverflow_closure"
            "-Wl,-u,_base_GHCziIOziException_heapOverflow_closure"
            "-Wl,-u,_base_GHCziIOziException_allocationLimitExceeded_closure"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/97cbb78fb70a760cb8fea6bb8bc85919533b684d...dbcd92ecebf09b452c7b01ccccf1427dfe8344b6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/97cbb78fb70a760cb8fea6bb8bc85919533b684d...dbcd92ecebf09b452c7b01ccccf1427dfe8344b6
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/20221020/57a5d120/attachment-0001.html>