diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2019-01-30 20:58:02 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2019-01-30 20:58:02 +0100 |
| commit | 74704110ca0eb6760a6e133ac88133a590d4ef8f (patch) | |
| tree | 3ca5c6d4eb185d342bd6ffe6d7b6f9b7ff50a5f5 /lib/Distribution/Helper.hs | |
| parent | 2613f676d0c6d16a92eaae00eb4cccad9504998e (diff) | |
Fix ghc-pkg guessing logic when using v2-install
Diffstat (limited to 'lib/Distribution/Helper.hs')
| -rw-r--r-- | lib/Distribution/Helper.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs index 664ff01..ca5c1b1 100644 --- a/lib/Distribution/Helper.hs +++ b/lib/Distribution/Helper.hs @@ -588,13 +588,15 @@ withProgs impl QueryEnv{..} f = do where -- | Determine ghc-pkg path from ghc path guessCompProgramPaths :: Verbose => CompPrograms -> IO CompPrograms + guessCompProgramPaths progs + | same ghcProgram progs dprogs = return progs guessCompProgramPaths progs = do let v | ?verbose = deafening | otherwise = silent mGhcPath0 | same ghcProgram progs dprogs = Nothing - | otherwise = Just $ ghcProgram progs + | otherwise = Just $ ghcProgram progs mGhcPkgPath0 | same ghcPkgProgram progs dprogs = Nothing - | otherwise = Just $ ghcPkgProgram progs + | otherwise = Just $ ghcPkgProgram progs (_compiler, _mplatform, progdb) <- GHC.configure v @@ -608,9 +610,9 @@ withProgs impl QueryEnv{..} f = do { ghcProgram = fromMaybe (ghcProgram progs) mghcPath1 , ghcPkgProgram = fromMaybe (ghcProgram progs) mghcPkgPath1 } - where - same f o o' = f o == f o' - dprogs = defaultCompPrograms + + same f o o' = f o == f o' + dprogs = defaultCompPrograms getHelperExe :: ProjInfo pt -> QueryEnvI c pt -> IO FilePath |