diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-05-09 14:45:01 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-13 20:09:51 -0400 |
| commit | c9f5a8f4653c4696a1fbb768bd0d8f672d4c7d5f (patch) | |
| tree | 640bfb7df6cfe25ef6c52138db2581fe9ff5962e | |
| parent | 1c999e5d4e63e7b407b174f51913cfa38e2dec46 (diff) | |
| download | haskell-c9f5a8f4653c4696a1fbb768bd0d8f672d4c7d5f.tar.gz | |
hadrian: Tell testsuite driver about LLVM availability
This reflects the logic present in the Make build system into Hadrian.
Fixes #18167.
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 01aee6827d..293465b52b 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/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 |