[Git][ghc/ghc][wip/js-staging] 2 commits: testsuite: force ghc-pkg to use stage1

[doyougnu (@doyougnu)]

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


Commits:
0f65b61a by doyougnu at 2022-10-17T23:19:55-04:00
testsuite: force ghc-pkg to use stage1

- - - - -
dcae74a6 by doyougnu at 2022-10-17T23:19:55-04:00
fix linker errors post rebase

Re-add InitFini.c to the rts, it was introduced in
78ab7afe244a7617d600a6180d81d9dec657114d but was somehow removed after a
rebase.

- - - - -


2 changed files:

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


Changes:

=====================================
hadrian/src/Rules/Test.hs
=====================================
@@ -207,7 +207,7 @@ testRules = do
         -- cross-compilers)
         let absolute_path1
               | cross     = absolute_path_stage (Stage0 InTreeLibs)
-              | otherwise = absolute_path_stage stg
+              | otherwise = absolute_path_stage $ predStage stg
 
         ghcPath <- getCompilerPath testCompilerArg
 


=====================================
rts/rts.cabal.in
=====================================
@@ -597,6 +597,7 @@ library
                  hooks/StackOverflow.c
                  linker/CacheFlush.c
                  linker/Elf.c
+                 linker/InitFini.c
                  linker/LoadArchive.c
                  linker/M32Alloc.c
                  linker/MMap.c



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3282174cd2e861baec03ac5b9f89c794356cf083...dcae74a64fb2f2e82d936e072f21353169a60fef

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3282174cd2e861baec03ac5b9f89c794356cf083...dcae74a64fb2f2e82d936e072f21353169a60fef
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/20221017/a4df6fc7/attachment.html>