Skip to content

Commit

Permalink
Fix uses of verbosity > deafening to use >=
Browse files Browse the repository at this point in the history
The maximum verbosity value is deafening so >= the correct test.
This primarily affected haddock.
  • Loading branch information
dcoutts committed Jul 29, 2008
1 parent c1f3d40 commit bdcc0d2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Distribution/Simple/GHC.hs
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ constructCcCmdLine lbi bi pref filename verbosity
in
(odir,
ghcCcOptions lbi bi odir
++ (if verbosity > deafening then ["-v"] else [])
++ (if verbosity >= deafening then ["-v"] else [])
++ ["-c",filename])


Expand Down
2 changes: 1 addition & 1 deletion Distribution/Simple/Haddock.hs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ haddock pkg_descr lbi suffixes flags = do
let cssFileFlag = case flagToMaybe $ haddockCss flags of
Nothing -> []
Just cssFile -> ["--css=" ++ cssFile]
let verboseFlags = if verbosity > deafening then ["--verbose"] else []
let verboseFlags = if verbosity >= deafening then ["--verbose"] else []
when (hsColour && not have_src_hyperlink_flags) $
die "haddock --hyperlink-source requires Haddock version 0.8 or later"
let linkToHscolour = if hsColour
Expand Down
2 changes: 1 addition & 1 deletion Distribution/Simple/NHC.hs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ build pkg_descr lbi verbosity = do
-- build any C sources
unless (null (cSources bi)) $ do
info verbosity "Building C Sources..."
let commonCcArgs = (if verbosity > deafening then ["-v"] else [])
let commonCcArgs = (if verbosity >= deafening then ["-v"] else [])
++ ["-I" ++ dir | dir <- includeDirs bi]
++ [opt | opt <- ccOptions bi]
++ (if withOptimization lbi then ["-O2"] else [])
Expand Down

0 comments on commit bdcc0d2

Please sign in to comment.