fix --ghc-options and --with-ghc

Author: sheaf

cabal-install/src/Distribution/Client/SetupWrapper.hs

@@ -92,18 +92,7 @@ import Distribution.Simple.PreProcess
   , runSimplePreProcessor
   )
 import Distribution.Simple.Program
-  ( ProgramDb
-  , emptyProgramDb
-  , getDbProgramOutputCwd
-  , getProgramSearchPath
-  , ghcProgram
-  , ghcjsProgram
-  , runDbProgramCwd
-  )
 import Distribution.Simple.Program.Db
-  ( prependProgramSearchPath, updatePathProgDb
-  , progOverrideEnv
-  )
 import Distribution.Simple.Program.Find
   ( programSearchPathAsPATHVar
   )
@@ -658,7 +647,9 @@ setupWrapper verbosity options mpkg cmd getCommonFlags getFlags getExtraArgs wra
         InLibraryArgs libArgs ->
           case libArgs of
             InLibraryConfigureArgs elabSharedConfig elabReadyPkg -> do
-              let setupProgDb = useProgramDb options
+              let setupProgDb = userSpecifyPaths (configProgramPaths flags)
+                              $ userSpecifyArgss (configProgramArgs flags)
+                              $ useProgramDb options
               progDb' <-
                 prependProgramSearchPath verbosity (useExtraPathEnv options) (useExtraEnvOverrides options) setupProgDb
               lbi0 <-