Commit 43351ff0 authored by thomie's avatar thomie

Filter out `-Rghc-timing` for V=0 builds (#10223)

Reviewed By: austin

Differential Revision: https://phabricator.haskell.org/D783
parent 3749c052
......@@ -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"
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment