Merge branch 'fix-stack-setup-gcc' of https://github.com/hasufell/stack…

… into hasufell-fix-stack-setup-gcc
commercialhaskell · Jul 30, 2022 · 8f2977c · 8f2977c
2 parents 3ecd5b6 + 4255f1a
commit 8f2977c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -1460,9 +1460,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))