Merge pull request haskell#3541 from ezyang/pr/no-verbose-ghc

Don't pass Cabal's verbosity to GHC, fixes haskell#3540.
ezyang · Jul 12, 2016 · 5423d77 · 5423d77
2 parents 9a4bfc3 + 59eabde
commit 5423d77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Cabal/Distribution/Simple/GHC/Internal.hs b/Cabal/Distribution/Simple/GHC/Internal.hs
@@ -242,9 +242,10 @@ componentCcGhcOptions :: Verbosity -> GhcImplInfo -> LocalBuildInfo
                       -> BuildInfo -> ComponentLocalBuildInfo
                       -> FilePath -> FilePath
                       -> GhcOptions
-componentCcGhcOptions verbosity _implInfo lbi bi clbi odir filename =
+componentCcGhcOptions _verbosity _implInfo lbi bi clbi odir filename =
     mempty {
-      ghcOptVerbosity      = toFlag verbosity,
+      -- Use --ghc-option=-v instead!
+      ghcOptVerbosity      = NoFlag,
       ghcOptMode           = toFlag GhcModeCompile,
       ghcOptInputFiles     = toNubListR [filename],
 
@@ -268,9 +269,10 @@ componentCcGhcOptions verbosity _implInfo lbi bi clbi odir filename =
 componentGhcOptions :: Verbosity -> LocalBuildInfo
                     -> BuildInfo -> ComponentLocalBuildInfo -> FilePath
                     -> GhcOptions
-componentGhcOptions verbosity lbi bi clbi odir =
+componentGhcOptions _verbosity lbi bi clbi odir =
     mempty {
-      ghcOptVerbosity       = toFlag verbosity,
+      -- Use --ghc-option=-v instead!
+      ghcOptVerbosity       = NoFlag,
       ghcOptHideAllPackages = toFlag True,
       ghcOptCabal           = toFlag True,
       ghcOptThisUnitId      = case clbi of

diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs
@@ -624,7 +624,8 @@ externalSetupMethod verbosity options pkg bt mkargs = do
           addRenaming (ipid, _) = (ipid, defaultRenaming)
           cppMacrosFile = setupDir </> "setup_macros.h"
           ghcOptions = mempty {
-              ghcOptVerbosity       = Flag verbosity
+              -- Use --ghc-option=-v instead!
+              ghcOptVerbosity       = NoFlag
             , ghcOptMode            = Flag GhcModeMake
             , ghcOptInputFiles      = toNubListR [setupHs]
             , ghcOptOutputFile      = Flag setupProgFile