diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mk/flavours/bench-llvm.mk | 8 | ||||
| -rw-r--r-- | mk/flavours/perf-llvm.mk | 4 | ||||
| -rw-r--r-- | mk/flavours/quick-llvm.mk | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -71,7 +71,7 @@ include mk/custom-settings.mk # Verify that stage 0 LLVM backend isn't affected by Bug #9439 if needed ifeq "$(GHC_LLVM_AFFECTED_BY_9439)" "1" -ifneq "$(findstring -fllvm,$(GhcHcOpts) $(GhcStage1HcOpts))" "" +ifneq "$(findstring -fllvm,$(SRC_HC_OPTS) $(GhcHcOpts) $(GhcStage1HcOpts))" "" $(error Stage 0 compiler is affected by Bug #9439. Refusing to bootstrap with -fllvm) endif endif diff --git a/mk/flavours/bench-llvm.mk b/mk/flavours/bench-llvm.mk index 99957b9fdb..816d7c7b0d 100644 --- a/mk/flavours/bench-llvm.mk +++ b/mk/flavours/bench-llvm.mk @@ -1,7 +1,7 @@ -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fllvm -GhcStage2HcOpts = -O0 -fllvm -GhcLibHcOpts = -O2 -fllvm +SRC_HC_OPTS = -O -H64m -fllvm +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O0 +GhcLibHcOpts = -O2 BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO diff --git a/mk/flavours/perf-llvm.mk b/mk/flavours/perf-llvm.mk index 581037f7f8..c49849fd36 100644 --- a/mk/flavours/perf-llvm.mk +++ b/mk/flavours/perf-llvm.mk @@ -1,6 +1,6 @@ SRC_HC_OPTS = -O -H64m -fllvm -GhcStage1HcOpts = -O -fllvm -GhcStage2HcOpts = -O2 -fllvm +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O2 GhcLibHcOpts = -O2 BUILD_PROF_LIBS = YES #SplitObjs diff --git a/mk/flavours/quick-llvm.mk b/mk/flavours/quick-llvm.mk index 90ccb7ac28..e565327822 100644 --- a/mk/flavours/quick-llvm.mk +++ b/mk/flavours/quick-llvm.mk @@ -1,7 +1,7 @@ SRC_HC_OPTS = -O0 -H64m -fllvm -GhcStage1HcOpts = -O -fllvm -GhcStage2HcOpts = -O0 -fllvm -GhcLibHcOpts = -O -fllvm +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O0 +GhcLibHcOpts = -O BUILD_PROF_LIBS = NO SplitObjs = NO HADDOCK_DOCS = NO |