Skip to content

Commit bc52b09

Browse files
committed
fixup! fix(Cabal): do not use GHC to configure LD
1 parent ab0a509 commit bc52b09

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Cabal/src/Distribution/Simple/GHC/Internal.hs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,12 @@ configureToolchain verbosity _implInfo ghcProg ghcInfo db = do
120120
-- ghc to compile a _test_ c program. So we configure `gcc`
121121
-- first and then use `gcc` (the generic c compiler in cabal
122122
-- terminology) to compile the test program.
123-
let db' =
124-
flip addKnownProgram db $
125-
gccProgram
126-
{ programFindLocation = findProg gccProgramName extraGccPath
127-
, programPostConf = configureGcc
128-
}
129-
(gccProg, db'') <- requireProgram verbosity gccProgram db'
123+
let gccProgram' = gccProgram
124+
{ programFindLocation = findProg gccProgramName extraGccPath
125+
, programPostConf = configureGcc
126+
}
127+
let db' = flip addKnownProgram db $ gccProgram'
128+
(gccProg, db'') <- requireProgram verbosity gccProgram' db'
130129
return $
131130
flip addKnownPrograms db'' $
132131
[ gppProgram

0 commit comments

Comments
 (0)