diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-25 17:49:32 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-07 11:56:55 +0200 |
| commit | b40e55954ecdab650d35349cbb93e53df952310e (patch) | |
| tree | b5129c31d2371384f10f531c5da9bb5cc0b28a89 | |
| parent | 2c24fd707f8650205bb574ffac5f376239af3723 (diff) | |
| download | haskell-b40e55954ecdab650d35349cbb93e53df952310e.tar.gz | |
Build system: simplify *-llvm BuildFlavours (#10223)
Note that SRC_HC_OPTS are added to every Haskell compilation. So
there isn't any need to also add `-fllvm` to GhcStage1HcOpts,
GhcStage2HcOpts and GhcLibHcOpts.
Small bug fix: make sure we test for -fllvm in SRC_HC_OPTS, to check
whether the bootstrap compiler is affected by bug #9439.
Reviewed by: austin
Differential Revision: https://phabricator.haskell.org/D1188
| -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 |