summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-08-25 17:49:32 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-09-07 11:56:55 +0200
commitb40e55954ecdab650d35349cbb93e53df952310e (patch)
treeb5129c31d2371384f10f531c5da9bb5cc0b28a89 /Makefile
parent2c24fd707f8650205bb574ffac5f376239af3723 (diff)
downloadhaskell-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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 217205ccba..38c7eb9be4 100644
--- a/Makefile
+++ b/Makefile
@@ -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