diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-11 09:38:18 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-06-17 16:22:04 -0400 |
| commit | dceecb093c3ee1e4dc970bb6669ff855ec37f6ac (patch) | |
| tree | 74158d954b52c6c5cf0fbc294d79873a066e79cb /hadrian/src/Settings/Builders/RunTest.hs | |
| parent | f817d816e60a487bca64037095c01e9956225b64 (diff) | |
| download | haskell-dceecb093c3ee1e4dc970bb6669ff855ec37f6ac.tar.gz | |
Update Hadrian
* support ghc-bignum backend selection in flavours and command-line
* support ghc-bignum "--check" flag (compare results of selected backend
against results of the native one) in flavours and command-line (e.g.
pass --bignum=check-gmp" to check the "gmp" backend)
* remove the hack to workaround #15286
* build GMP only when the gmp backend is used
* remove hacks to workaround `text` package flags about integer-*. We
fix `text` to use ghc-bignum unconditionally in another patch
Diffstat (limited to 'hadrian/src/Settings/Builders/RunTest.hs')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 293465b52b..c10e93aae0 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -87,6 +87,8 @@ runTestBuilderArgs = builder RunTest ? do top <- expr $ topDirectory ghcFlags <- expr runTestGhcFlags cmdrootdirs <- expr (testRootDirs <$> userSetting defaultTestArgs) + bignumBackend <- getBignumBackend + bignumCheck <- getBignumCheck let defaultRootdirs = ("testsuite" -/- "tests") : libTests rootdirs | null cmdrootdirs = defaultRootdirs | otherwise = cmdrootdirs @@ -121,9 +123,11 @@ runTestBuilderArgs = builder RunTest ? do , arg "-e", arg $ asBool "config.have_vanilla=" (hasLibWay vanilla) , arg "-e", arg $ asBool "config.have_dynamic=" (hasLibWay dynamic) , arg "-e", arg $ asBool "config.have_profiling=" (hasLibWay profiling) + , arg "-e", arg $ asBool "config.have_fast_bignum=" (bignumBackend /= "native" && not bignumCheck) , arg "-e", arg $ asBool "ghc_with_smp=" withSMP , 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 |