[Git][ghc/ghc][wip/hadrian-cross-stage2] 2 commits: Fix cabal flags for rts

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
cb6a7c1c by GHC GitLab CI at 2023-10-12T14:14:06+01:00
Fix cabal flags for rts

- - - - -
a17827a4 by Matthew Pickering at 2023-10-12T14:16:13+01:00
Run full testsuite on wasm

- - - - -


2 changed files:

- .gitlab/ci.sh
- hadrian/src/Settings/Packages.hs


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -592,7 +592,7 @@ function test_hadrian() {
     info "Cannot test cross-compiled build without CROSS_EMULATOR being set."
     return
   # If we have set CROSS_EMULATOR, then can't test using normal testsuite.
-  elif [ -n "${CROSS_EMULATOR:-}" ]; then
+  elif [ -n "${CROSS_EMULATOR:-}" ] && [[ "${CROSS_TARGET:-}" != *"wasm"* ]]; then
     local instdir="$TOP/_build/install"
     local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
     install_bindist _build/bindist/ghc-*/ "$instdir"


=====================================
hadrian/src/Settings/Packages.hs
=====================================
@@ -282,8 +282,8 @@ rtsPackageArgs = package rts ? do
     targetArch     <- queryTarget stage queryArch
     targetOs       <- queryTarget stage queryOS
     targetVendor   <- queryTarget stage queryVendor
-    ghcUnreg       <- yesNo <$> queryTarget stage tgtUnregisterised
-    ghcEnableTNC   <- yesNo <$> queryTarget stage tgtTablesNextToCode
+    ghcUnreg       <- queryTarget stage tgtUnregisterised
+    ghcEnableTNC   <- queryTarget stage tgtTablesNextToCode
     rtsWays        <- getRtsWays
     way            <- getWay
     path           <- getBuildPath
@@ -352,8 +352,8 @@ rtsPackageArgs = package rts ? do
             , "-DTargetArch="                ++ show targetArch
             , "-DTargetOS="                  ++ show targetOs
             , "-DTargetVendor="              ++ show targetVendor
-            , "-DGhcUnregisterised="         ++ show ghcUnreg
-            , "-DTablesNextToCode="          ++ show ghcEnableTNC
+            , "-DGhcUnregisterised="         ++ show (yesNo ghcUnreg)
+            , "-DTablesNextToCode="          ++ show (yesNo ghcEnableTNC)
             ]
 
           -- We're after pur performance here. So make sure fast math and
@@ -400,6 +400,8 @@ rtsPackageArgs = package rts ? do
           , useSystemFfi                    `cabalFlag` "use-system-libffi"
           , targetUseLibffiForAdjustors stage     `cabalFlag` "libffi-adjustors"
           , Debug `wayUnit` way             `cabalFlag` "find-ptr"
+          , ghcEnableTNC `cabalFlag` "tables-next-to-code"
+          , ghcUnreg `cabalFlag` "unregisterised"
           ]
         , builder (Cabal Setup) ? mconcat
               [ cabalExtraDirs libdwIncludeDir libdwLibraryDir



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbe81e392f1671fc50b0b03b6903cd1f711428b1...a17827a405c5731a469b8e6adde25dd85ad474d2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbe81e392f1671fc50b0b03b6903cd1f711428b1...a17827a405c5731a469b8e6adde25dd85ad474d2
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/20231012/f3ff95b7/attachment-0001.html>