[Git][ghc/ghc][wip/req_smp] only set ghc_with_smp to bootstrapper on S1 or CC

[doyougnu (@doyougnu)]

doyougnu pushed to branch wip/req_smp at Glasgow Haskell Compiler / GHC


Commits:
07485f6f by doyougnu at 2022-12-17T11:28:59-05:00
only set ghc_with_smp to bootstrapper on S1 or CC

Only set ghc_with_smp to bootstrapperWithSMP of when testing stage 1
and cross compiling

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/RunTest.hs


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -148,7 +148,8 @@ outOfTreeCompilerArgs = do
     withInterpreter     <- getBooleanSetting TestGhcWithInterpreter
     unregisterised      <- getBooleanSetting TestGhcUnregisterised
     tables_next_to_code <- getBooleanSetting TestGhcUnregisterised
-    withSMP             <- getBooleanSetting TestGhcWithSMP
+    bootstrapperWithSMP <- getBooleanSetting TestGhcWithSMP
+    targetWithSMP       <- getBooleanSetting TestGhcWithSMP
     debugAssertions     <- getBooleanSetting TestGhcDebugged
 
     os          <- getTestSetting TestHostOS
@@ -204,7 +205,8 @@ runTestBuilderArgs = builder Testsuite ? do
     bignumBackend <- getBignumBackend
     bignumCheck   <- getBignumCheck
 
-    keepFiles           <- expr (testKeepFiles <$> userSetting defaultTestArgs)
+    keepFiles <- expr (testKeepFiles <$> userSetting defaultTestArgs)
+    isCross   <- cross
 
     accept <- expr (testAccept <$> userSetting defaultTestArgs)
     (acceptPlatform, acceptOS) <- expr . liftIO $
@@ -264,7 +266,9 @@ runTestBuilderArgs = builder Testsuite ? do
             , arg "-e", arg $ asBool "ghc_with_dynamic_rts="  (hasDynamicRts)
             , arg "-e", arg $ asBool "ghc_with_threaded_rts=" (hasThreadedRts)
             , arg "-e", arg $ asBool "config.have_fast_bignum=" (bignumBackend /= "native" && not bignumCheck)
-            , arg "-e", arg $ asBool "ghc_with_smp="    bootstrapperWithSMP
+            , arg "-e", arg $ asBool "ghc_with_smp="    (if stageNumber (C.stage ctx) == 1 || isCross
+                                                         then targetWithSMP
+                                                         else bootstrapperWithSMP)
             , arg "-e", arg $ asBool "target_with_smp=" targetWithSMP
 
             , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/07485f6fed5927d76936b6556d91ce0fa37819ab

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/07485f6fed5927d76936b6556d91ce0fa37819ab
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/20221217/a098c896/attachment-0001.html>