diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2022-03-24 10:46:33 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-28 01:19:12 -0400 |
| commit | cc59648adbf480e6af14e31e9e46801ab095f11a (patch) | |
| tree | c1f84cd5602acbf48b93bc24bde7fae19827ae70 | |
| parent | 4aeade157474ae379466343b00920bbcc0bfa628 (diff) | |
| download | haskell-cc59648adbf480e6af14e31e9e46801ab095f11a.tar.gz | |
Hadrian: allow testsuite to run with cross-compilers (#21292)
| -rw-r--r-- | hadrian/src/Rules/Test.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs index 4b0ba4a913..f89bfd396a 100644 --- a/hadrian/src/Rules/Test.hs +++ b/hadrian/src/Rules/Test.hs @@ -10,6 +10,7 @@ import Hadrian.Haskell.Cabal.Type (packageDependencies) import Hadrian.Oracles.Cabal (readPackageData) import Oracles.Setting import Oracles.TestSettings +import Oracles.Flag import Packages import Settings import Settings.Builders.RunTest @@ -284,7 +285,8 @@ needTestsuitePackages stg = do let pkgs = filter (\(_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && stg == Stage0)) (libpkgs ++ exepkgs ++ [ (stg,timeout) | windowsHost ]) need =<< mapM (uncurry pkgFile) pkgs - needIservBins stg + cross <- flag CrossCompiling + when (not cross) $ needIservBins stg root <- buildRoot -- require the shims for testing stage1 need =<< sequence [(\f -> root -/- "stage1-test/bin" -/- takeFileName f) <$> (pkgFile Stage0 p) | (Stage0,p) <- exepkgs] |