summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hadrian/README.md7
-rw-r--r--hadrian/doc/user-settings.md35
2 files changed, 5 insertions, 37 deletions
diff --git a/hadrian/README.md b/hadrian/README.md
index 55e16268bf..4d772891be 100644
--- a/hadrian/README.md
+++ b/hadrian/README.md
@@ -117,8 +117,11 @@ four settings: `none`, `brief` (one line per build command; this is the default
setting), `normal` (typically a box per build command), and `unicorn` (when
`normal` just won't do).
-* `--verbose`: run Hadrian in verbose mode. In particular this prints diagnostic
-messages by Shake oracles.
+* `-V`/`--verbose`: run Hadrian in verbose mode. This makes commands print their stdout
+ and produces slightly more output on a failure (including hadrian call stacks).
+
+* `-VV`: run hadrian in diagnostics mode: In particular this prints diagnostic
+messages by Shake oracles and full command lines for all commands.
* `--lint`: run [Shake Lint](https://shakebuild.com/manual#lint) during the
build to check that the build system is well formed. Note that the Lint check
diff --git a/hadrian/doc/user-settings.md b/hadrian/doc/user-settings.md
index cc5dc2d621..5b6c5ca65a 100644
--- a/hadrian/doc/user-settings.md
+++ b/hadrian/doc/user-settings.md
@@ -220,41 +220,6 @@ noDynamicFlavour = defaultFlavour
, libraryWays = remove [dynamic] defaultLibraryWays }
```
-### Verbose command lines
-
-By default Hadrian does not print full command lines during the build process
-and instead prints short human readable digests for each executed command. You
-can suppress this behaviour completely or partially using `verboseCommand` setting:
-```haskell
--- | Set to 'True' to print full command lines during the build process. Note:
--- this is a 'Predicate', hence you can enable verbose output only for certain
--- targets, e.g.: @verboseCommand = package ghcPrim@.
-verboseCommand :: Predicate
-verboseCommand = do
- verbosity <- expr getVerbosity
- return $ verbosity >= Verbose
-```
-For example, to print the full command lines used to compile GHC executables,
-set `verboseCommands` to:
-```haskell
-verboseCommand :: Predicate
-verboseCommand = input "ghc/Main.hs"
-```
-Below are a few other examples:
-```haskell
--- Print command lines for all Ghc Link invocations:
-verboseCommand = builder (Ghc Link)
-
--- Print command lines when compiling files in package compiler using Gcc:
-verboseCommand = builder (Gcc Compile) &&^ package compiler
-
--- Use patterns when matching files:
-verboseCommand = output "**/rts/sm/*" &&^ way threaded
-
--- Print all commands:
-verboseCommand = return True
-```
-
### Documentation
`Flavour`'s `ghcDocs :: Action DocTargets` field lets you