[Git][ghc/ghc][master] hadrian: Tell testsuite driver about LLVM availability

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
c9f5a8f4 by Ben Gamari at 2020-05-13T20:09:51-04:00
hadrian: Tell testsuite driver about LLVM availability

This reflects the logic present in the Make build system into Hadrian.

Fixes #18167.

- - - - -


1 changed file:

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


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -70,6 +70,7 @@ runTestBuilderArgs = builder RunTest ? do
     withSMP             <- getBooleanSetting TestGhcWithSMP
     debugged            <- getBooleanSetting TestGhcDebugged
     keepFiles           <- expr (testKeepFiles <$> userSetting defaultTestArgs)
+    withLlvm            <- expr (not . null <$> settingsFileSetting SettingsFileSetting_LlcCommand)
 
     accept <- expr (testAccept <$> userSetting defaultTestArgs)
     (acceptPlatform, acceptOS) <- expr . liftIO $
@@ -121,7 +122,7 @@ runTestBuilderArgs = builder RunTest ? do
             , arg "-e", arg $ asBool "config.have_dynamic="   (hasLibWay dynamic)
             , arg "-e", arg $ asBool "config.have_profiling=" (hasLibWay profiling)
             , arg "-e", arg $ asBool "ghc_with_smp=" withSMP
-            , arg "-e", arg $ "ghc_with_llvm=0" -- TODO: support LLVM
+            , arg "-e", arg $ asBool "ghc_with_llvm=" withLlvm
 
             , arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault
             , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c9f5a8f4653c4696a1fbb768bd0d8f672d4c7d5f
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/20200513/16a429c4/attachment-0001.html>