Skip to content

Commit 8f2977c

Browse files
committed
Merge branch 'fix-stack-setup-gcc' of https://github.com/hasufell/stack into hasufell-fix-stack-setup-gcc
2 parents 3ecd5b6 + 4255f1a commit 8f2977c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Stack/Setup.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,9 +1460,10 @@ installGHCPosix downloadInfo _ archiveFile archiveType tempDir destDir = do
14601460

14611461
dir <- expectSingleUnpackedDir archiveFile tempDir
14621462

1463+
gccEnvMaybe <- fmap (\gcc -> Map.fromList [("CC", T.pack (toFilePath gcc))]) <$> (view $ configL.to configOverrideGccPath)
14631464
logSticky "Configuring GHC ..."
14641465
runStep "configuring" dir
1465-
(gdiConfigureEnv downloadInfo)
1466+
(fromMaybe Map.empty gccEnvMaybe `Map.union` gdiConfigureEnv downloadInfo)
14661467
(toFilePath $ dir </> relFileConfigure)
14671468
(("--prefix=" ++ toFilePath destDir) : map T.unpack (gdiConfigureOpts downloadInfo))
14681469

0 commit comments

Comments
 (0)