Commit 54e23f69 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Fix configCompilerAux to consider user-supplied program flags

This fixes a bug in cabal-install
parent f8eb9aa9
...@@ -623,8 +623,12 @@ configCompilerAux :: ConfigFlags -> IO (Compiler, ProgramConfiguration) ...@@ -623,8 +623,12 @@ configCompilerAux :: ConfigFlags -> IO (Compiler, ProgramConfiguration)
configCompilerAux cfg = configCompiler (flagToMaybe $ configHcFlavor cfg) configCompilerAux cfg = configCompiler (flagToMaybe $ configHcFlavor cfg)
(flagToMaybe $ configHcPath cfg) (flagToMaybe $ configHcPath cfg)
(flagToMaybe $ configHcPkg cfg) (flagToMaybe $ configHcPkg cfg)
defaultProgramConfiguration programsConfig
(fromFlag (configVerbosity cfg)) (fromFlag (configVerbosity cfg))
where
programsConfig = userSpecifyArgss (configProgramArgs cfg)
. userSpecifyPaths (configProgramPaths cfg)
$ defaultProgramConfiguration
configCompiler :: Maybe CompilerFlavor -> Maybe FilePath -> Maybe FilePath configCompiler :: Maybe CompilerFlavor -> Maybe FilePath -> Maybe FilePath
-> ProgramConfiguration -> Verbosity -> ProgramConfiguration -> Verbosity
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment