summaryrefslogtreecommitdiff
path: root/ghc/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-07-17 15:07:46 +0000
committerIan Lynagh <igloo@earth.li>2008-07-17 15:07:46 +0000
commit48c3232a53eb5a0594991e4af602bf91364a2cc4 (patch)
tree83d7b155ee30cbf65a3bc99992067644d1711365 /ghc/Makefile
parentbcbd8d8e5f42e11c68d36c601233b37afb2b11be (diff)
downloadhaskell-48c3232a53eb5a0594991e4af602bf91364a2cc4.tar.gz
Split building the ghc package and binary into "boot" and "all" steps
In "boot" we configure, and in "all" we do the actual building.
Diffstat (limited to 'ghc/Makefile')
-rw-r--r--ghc/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/ghc/Makefile b/ghc/Makefile
index 4b3e05cfb5..312ab05bbe 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -13,8 +13,7 @@ else
INSTALL_FLAGS = --enable-shell-wrappers
endif
-boot:
- @:
+boot:: boot.stage.$(stage)
all:: build.stage.$(stage)
@@ -73,12 +72,14 @@ CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
# It works because installPackage doesn't actually use ghc-pkg, as there's
# no library to register
-build.stage.%:
+boot.stage.%:
$(CABAL) configure --distpref dist-stage$* \
$(SET_DATA_SUBDIR) \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
$(CONFIGURE_FLAGS_STAGE$*) \
$(COMMON_CONFIGURE_FLAGS)
+
+build.stage.%:
$(CABAL) build --distpref dist-stage$* $(BUILD_FLAGS)
$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
$(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \