From 6ea4eb4babf090e447277a3e4b0dea31d79e9acf Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 9 Dec 2019 15:32:58 -0500 Subject: testsuite: Make ghc_built_by_llvm check more precise Previously it would hackily look at the flavour name to determine whether LLVM was used to build stage2 ghc. However, this didn't work at all with Hadrian and would miss cases like ARM where we use the LLVM backend by default. See #16087 for the motivation for why ghc_built_by_llvm is needed at all. This should catch one of the ARMv7 failures described in #17555. --- hadrian/src/Settings/Builders/RunTest.hs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'hadrian') diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index a26092ef49..d3ce1c6fb8 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -93,9 +93,6 @@ runTestBuilderArgs = builder RunTest ? do let timeoutProg = root -/- timeoutPath statsFilesDir <- expr haddockStatsFilesDir - -- See #16087 - let ghcBuiltByLlvm = False -- TODO: Implement this check - let asBool :: String -> Bool -> String asBool s b = s ++ show b @@ -128,7 +125,6 @@ runTestBuilderArgs = builder RunTest ? do , arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic - , arg "-e", arg $ "config.ghc_built_by_llvm=" ++ show ghcBuiltByLlvm , arg "-e", arg $ "config.top=" ++ show (top -/- "testsuite") , arg "-e", arg $ "config.wordsize=" ++ show wordsize -- cgit v1.2.1