From 4255f1af06f432d56c48f8de2b2cf70d3345d18c Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 24 Aug 2021 16:03:37 +0200 Subject: [PATCH] Pass 'with-gcc:' specified compiler to 'stack setup', fixes #5493 --- src/Stack/Setup.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs index c728879cb3..77d35f07ee 100644 --- a/src/Stack/Setup.hs +++ b/src/Stack/Setup.hs @@ -1405,9 +1405,10 @@ installGHCPosix downloadInfo _ archiveFile archiveType tempDir destDir = do dir <- expectSingleUnpackedDir archiveFile tempDir + gccEnvMaybe <- fmap (\gcc -> Map.fromList [("CC", T.pack (toFilePath gcc))]) <$> (view $ configL.to configOverrideGccPath) logSticky "Configuring GHC ..." runStep "configuring" dir - (gdiConfigureEnv downloadInfo) + (fromMaybe Map.empty gccEnvMaybe `Map.union` gdiConfigureEnv downloadInfo) (toFilePath $ dir relFileConfigure) (("--prefix=" ++ toFilePath destDir) : map T.unpack (gdiConfigureOpts downloadInfo))