From d8ac8aaf50af092ebcb0a03a8f78e592fd2fb593 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 7 Jul 2021 17:20:15 +0100
Subject: [PATCH] hadrian: Add exe suffix to executables in testsuite
(cherry picked from commit 45f0555455f7384727d959954dc359d491f32ebf)
---
hadrian/src/Settings/Builders/RunTest.hs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs
index ae676f2c1150..7f54c0de0041 100644
--- a/hadrian/src/Settings/Builders/RunTest.hs
+++ b/hadrian/src/Settings/Builders/RunTest.hs
@@ -179,12 +179,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")]
+ ghcPkgArg = ["--config", "ghc_pkg=" ++ show (bindir -/- "ghc-pkg" <.> exe)]
haddockArg = if haveDocs
- then [ "--config", "haddock=" ++ show (bindir -/- "haddock") ]
+ then [ "--config", "haddock=" ++ show (bindir -/- "haddock" <.> exe) ]
else [ "--config", "haddock=" ]
- hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- "hp2ps")]
- hpcArg = ["--config", "hpc=" ++ show (bindir -/- "hpc")]
+ hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- "hp2ps" <.> exe)]
+ hpcArg = ["--config", "hpc=" ++ show (bindir -/- "hpc" <.> exe)]
inTreeArg = [ "-e", "config.in_tree_compiler=" ++
show (testCompiler args `elem` ["stage1", "stage2", "stage3"]) ]
--
GitLab