From 191fea2b6feb718e390d9f4d78a9b11528fe0eec Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 28 Feb 2020 10:47:54 -0500
Subject: [PATCH] hadrian: Eliminate redundant .exe from GHC path
Previously we were invoking:
bash -c
"c:/GitLabRunner/builds/eEQrxK4p/0/ghc/ghc/toolchain/bin/ghc.exe.exe
testsuite/mk/ghc-config.hs -o _build/test/bin/ghc-config.exe"
---
hadrian/src/Rules/Test.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index 915118888328..8f1523724cb2 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/hadrian/src/Rules/Test.hs
@@ -46,7 +46,7 @@ testRules = do
-- Using program shipped with testsuite to generate ghcconfig file.
root -/- ghcConfigProgPath %> \_ -> do
- ghc0Path <- (<.> exe) <$> getCompilerPath "stage0"
+ ghc0Path <- getCompilerPath "stage0"
-- Invoke via bash to work around #17362.
-- Reasons why this is required are not entirely clear.
cmd ["bash"] ["-c", ghc0Path ++ " " ++ ghcConfigHsPath ++ " -o " ++ (root -/- ghcConfigProgPath)]
--
GitLab