diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-04-01 19:30:16 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-04-01 19:30:31 +0200 |
| commit | 43351ff0905a098c382487c502ccad53783ba9ee (patch) | |
| tree | cf1977f950d522a8412889fb709f05346686eb93 | |
| parent | 3749c05216339df60e1ffbb28c8b957ad5020b00 (diff) | |
| download | haskell-43351ff0905a098c382487c502ccad53783ba9ee.tar.gz | |
Filter out `-Rghc-timing` for V=0 builds (#10223)
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D783
| -rw-r--r-- | compiler/ghc.mk | 6 | ||||
| -rw-r--r-- | mk/build.mk.sample | 11 | ||||
| -rwxr-xr-x | validate | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index c8cd557ae5..000912674d 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -676,9 +676,15 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci compiler_stage3_CONFIGURE_OPTS += --disable-library-for-ghci # after build-package, because that sets compiler_stage1_HC_OPTS: +ifeq "$(V)" "0" +compiler_stage1_HC_OPTS += $(filter-out -Rghc-timing,$(GhcHcOpts)) $(GhcStage1HcOpts) +compiler_stage2_HC_OPTS += $(filter-out -Rghc-timing,$(GhcHcOpts)) $(GhcStage2HcOpts) +compiler_stage3_HC_OPTS += $(filter-out -Rghc-timing,$(GhcHcOpts)) $(GhcStage3HcOpts) +else compiler_stage1_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) compiler_stage2_HC_OPTS += $(GhcHcOpts) $(GhcStage2HcOpts) compiler_stage3_HC_OPTS += $(GhcHcOpts) $(GhcStage3HcOpts) +endif ifneq "$(BINDIST)" "YES" diff --git a/mk/build.mk.sample b/mk/build.mk.sample index d016e843de..216f92cb2f 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -87,7 +87,6 @@ ifeq "$(BuildFlavour)" "perf" SRC_HC_OPTS = -O -H64m GhcStage1HcOpts = -O $(GhcFAsm) GhcStage2HcOpts = -O2 $(GhcFAsm) -GhcHcOpts = -Rghc-timing GhcLibHcOpts = -O2 #SplitObjs #HADDOCK_DOCS @@ -109,7 +108,6 @@ ifeq "$(BuildFlavour)" "perf-llvm" SRC_HC_OPTS = -O -H64m -fllvm GhcStage1HcOpts = -O -fllvm GhcStage2HcOpts = -O2 -fllvm -GhcHcOpts = -Rghc-timing GhcLibHcOpts = -O2 #SplitObjs #HADDOCK_DOCS @@ -128,7 +126,6 @@ ifeq "$(BuildFlavour)" "perf-cross" SRC_HC_OPTS = -O -H64m -fllvm GhcStage1HcOpts = -O2 GhcStage2HcOpts = -O2 -fllvm -GhcHcOpts = -Rghc-timing GhcLibHcOpts = -O2 #SplitObjs HADDOCK_DOCS = NO @@ -238,8 +235,8 @@ endif ifeq "$(BuildFlavour)" "devel1" SRC_HC_OPTS = -H64m -O $(GhcFAsm) -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O $(GhcFAsm) +GhcStage1HcOpts = -O0 -DDEBUG +GhcStage2HcOpts = -O $(GhcFAsm) GhcLibHcOpts = -O -dcore-lint SplitObjs = NO HADDOCK_DOCS = NO @@ -256,8 +253,8 @@ endif ifeq "$(BuildFlavour)" "devel2" SRC_HC_OPTS = -H64m -O $(GhcFAsm) -GhcStage1HcOpts = -Rghc-timing -O $(GhcFAsm) -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage1HcOpts = -O $(GhcFAsm) +GhcStage2HcOpts = -O0 -DDEBUG GhcLibHcOpts = -O -dcore-lint SplitObjs = NO HADDOCK_DOCS = NO @@ -172,7 +172,6 @@ echo "ValidateHpc=$hpc" >> mk/are-validating.mk if [ $be_quiet -eq 1 ]; then echo "V=0" >> mk/are-validating.mk # Less gunk - echo "GhcHcOpts=" >> mk/are-validating.mk # Remove -Rghc-timing fi if [ $use_dph -eq 1 ]; then |