From 511f23046320e97f2888d1a4576675df8c415ca6 Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Mon, 10 Apr 2023 01:07:33 +0000
Subject: [PATCH] hadrian: fix non-ghc program paths passed to testsuite driver
when testing cross GHC
(cherry picked from commit 1338b7a3354ed77f6add43c1d33b776db53e7036)
---
hadrian/src/Settings/Builders/RunTest.hs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs
index 7d40085e62f..0926b77e850 100644
--- a/hadrian/src/Settings/Builders/RunTest.hs
+++ b/hadrian/src/Settings/Builders/RunTest.hs
@@ -306,6 +306,7 @@ getTestArgs = do
bindir <- expr $ getBinaryDirectory (testCompiler args)
compiler <- expr $ getCompilerPath (testCompiler args)
globalVerbosity <- shakeVerbosity <$> expr getShakeOptions
+ cross_prefix <- expr crossPrefix
-- the testsuite driver will itself tell us if we need to generate the docs target
-- So we always pass the haddock path if the hadrian configuration allows us to build
-- docs
@@ -345,12 +346,12 @@ getTestArgs = do
Just verbosity -> Just $ "--verbose=" ++ verbosity
wayArgs = map ("--way=" ++) (testWays args)
compilerArg = ["--config", "compiler=" ++ show (compiler)]
- ghcPkgArg = ["--config", "ghc_pkg=" ++ show (bindir -/- "ghc-pkg" <.> exe)]
+ ghcPkgArg = ["--config", "ghc_pkg=" ++ show (bindir -/- (cross_prefix <> "ghc-pkg") <.> exe)]
haddockArg = if haveDocs
- then [ "--config", "haddock=" ++ show (bindir -/- "haddock" <.> exe) ]
+ then [ "--config", "haddock=" ++ show (bindir -/- (cross_prefix <> "haddock") <.> exe) ]
else [ "--config", "haddock=" ]
- hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- "hp2ps" <.> exe)]
- hpcArg = ["--config", "hpc=" ++ show (bindir -/- "hpc" <.> exe)]
+ hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- (cross_prefix <> "hp2ps") <.> exe)]
+ hpcArg = ["--config", "hpc=" ++ show (bindir -/- (cross_prefix <> "hpc") <.> exe)]
inTreeArg = [ "-e", "config.in_tree_compiler=" ++
show (isInTreeCompiler (testCompiler args) || testHasInTreeFiles args) ]
--
GitLab