From 2e5668a06cb75e0548c16dc3259a33a6d86e9098 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 9 May 2020 14:45:01 -0400 Subject: hadrian: Tell testsuite driver about LLVM availability This reflects the logic present in the Make build system into Hadrian. Fixes #18167. --- hadrian/src/Settings/Builders/RunTest.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1