summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-04-20 12:41:22 +0100
committerIan Lynagh <ian@well-typed.com>2013-04-20 13:02:02 +0100
commitdb14f97eb063642d4e7104fef1fa322f7b00c8bc (patch)
tree9050f4e22733af739f143957f3c0c476555dce34 /mk
parent54d7902002e2d36305087c0cf2234d890a93e833 (diff)
downloadhaskell-db14f97eb063642d4e7104fef1fa322f7b00c8bc.tar.gz
Some build system refactoring
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in12
1 files changed, 3 insertions, 9 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 275c21a803..57abc3afd5 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -444,16 +444,10 @@ ifneq "$(wildcard $(GHC).exe)" ""
GHC := $(GHC).exe
endif
-# Sometimes we want to invoke ghc from the build tree in different
-# places (eg. it's handy to have a nofib & a ghc build in the same
-# tree). We can refer to "this ghc" as $(GHC_INPLACE):
-
-GHC_INPLACE = $(GHC_STAGE1)
-
GHC_STAGE0 = $(GHC)
-GHC_STAGE1 = $(INPLACE_BIN)/ghc-stage1$(exeext)
-GHC_STAGE2 = $(INPLACE_BIN)/ghc-stage2$(exeext)
-GHC_STAGE3 = $(INPLACE_BIN)/ghc-stage3$(exeext)
+GHC_STAGE1 = $(ghc-stage1_INPLACE)
+GHC_STAGE2 = $(ghc-stage2_INPLACE)
+GHC_STAGE3 = $(ghc-stage3_INPLACE)
BOOTSTRAPPING_CONF = libraries/bootstrapping.conf