diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-09 15:32:58 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-17 07:24:40 -0500 |
| commit | 6ea4eb4babf090e447277a3e4b0dea31d79e9acf (patch) | |
| tree | 06d4a2e8e137ae55bca7f86c8c01ca22eb628f36 /hadrian | |
| parent | 7cef0b7d707c0b242ee788919f76a73d1a3d2c96 (diff) | |
| download | haskell-6ea4eb4babf090e447277a3e4b0dea31d79e9acf.tar.gz | |
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.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 4 |
1 files changed, 0 insertions, 4 deletions
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 |