X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=3c215a3840297de03deafffe7362668664bb36a1;hb=41ea53bfeccbb2fd33e5408f1dde47b0770d30e2;hp=210938acc01bd7c05f564b7ecbcc16ebe2b615c1;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 210938a..3c215a3 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -13,10 +13,17 @@ else
 INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
-boot:
-	@:
+# Don't strip the inplace versions, we might need to debug them
+INPLACE_INSTALL_FLAGS += --disable-executable-stripping
 
-all:: build.stage$(stage)
+boot:: boot.stage.$(stage)
+
+all:: build.stage.$(stage)
+
+rebuild ::
+	-$(CABAL) clean --distpref dist-stage$(stage)
+	$(RM) -rf stage$(stage)-inplace
+	$(MAKE) boot all
 
 stage1 ::
 	$(MAKE) stage=1
@@ -27,32 +34,17 @@ stage2 ::
 stage3 ::
 	$(MAKE) stage=3
 
-clean distclean::
-	-$(CABAL) clean --distpref dist-stage1
-	-$(CABAL) clean --distpref dist-stage2
-	$(RM) -rf stage1-inplace
-	$(RM) -rf stage2-inplace
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
+clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
+else
+clean distclean:: clean.stage.$(stage)
+endif
 
-build.stage1:
-	$(CABAL) configure --distpref dist-stage1 \
-	                   --flags=-ghci \
-	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_BOOT_CONFIGURE_FLAGS) \
-	                   $(COMMON_CONFIGURE_FLAGS)
-	$(CABAL) build     --distpref dist-stage1 $(BUILD_FLAGS)
-	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
-	                   $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
-	                   $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
-	                   '$$prefix/bin' \
-	                   '$$prefix/lib' \
-	                   '$$prefix/libexec' \
-	                   '$$prefix/dynlib' \
-	                   '$$prefix/data' \
-	                   '$$prefix/doc' \
-	                   '$$prefix/html' \
-	                   '$$prefix/haddock' \
-	                   --distpref dist-stage1 \
-	                   $(INSTALL_FLAGS)
+clean.stage.%:
+	-$(CABAL) clean --distpref dist-stage$*
+	$(RM) -rf stage$*-inplace
+
+CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
 ifeq "$(GhcWithInterpreter)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --flags=ghci
@@ -71,36 +63,70 @@ ifeq "$(GhcThreaded)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
 endif
 
-# XXX In stage2 we should really use the inplace ghc-pkg
+ifeq "$(BuildSharedLibs)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-dynamic
+endif
+
+CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
+
+CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
+
+# Allow EXTRA_HC_OPTS to be used from the command line to add options 
+# when building (e.g. -v)
+BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
+
+# XXX In stage2+ we should really use the inplace ghc-pkg
 # It works because installPackage doesn't actually use ghc-pkg, as there's
 # no library to register
 
-build.stage2:
-	$(CABAL) configure --distpref dist-stage2 \
-	                   $(CONFIGURE_FLAGS_STAGE2) \
+ifeq "$(stage)" "1"
+ifeq "$(ghc_ge_609)" "NO"
+# GHC 6.9+ can handle cross-package recompilation checking, but
+# we don't rely on the bootstrapping compiler being able to do this.
+TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
+endif
+endif
+
+dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
+
+boot.stage.%:
+	$(CABAL) configure --distpref dist-stage$*         \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_STAGE1_CONFIGURE_FLAGS) \
-	                   $(COMMON_CONFIGURE_FLAGS)
-	$(CABAL) build     --distpref dist-stage2 $(BUILD_FLAGS)
+	                   $(CONFIGURE_FLAGS_STAGE$*)      \
+	                   $(COMMON_CONFIGURE_FLAGS)       \
+	                   --libsubdir=.                   \
+	                   --datadir='$$libdir'            \
+	                   --datasubdir=.
+
+build.stage.%: dist-stage%
+	$(TOUCH_MAIN)
+	$(CABAL) build     --distpref dist-stage$* $(BUILD_FLAGS)
 	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
-	                   $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
-	                   $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
-	                   '$$prefix/bin' \
-	                   '$$prefix/lib' \
-	                   '$$prefix/libexec' \
-	                   '$$prefix/dynlib' \
-	                   '$$prefix/data' \
-	                   '$$prefix/doc' \
-	                   '$$prefix/html' \
-	                   '$$prefix/haddock' \
-	                   --distpref dist-stage2 \
+	                   $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace          \
+	                   $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace          \
+	                   '$$prefix'                                      \
+	                   '$(INPLACE_DATA_DIR)'                           \
+	                   '$$prefix/libexec'                              \
+	                   '$$prefix/dynlib'                               \
+	                   '$(INPLACE_DATA_DIR)'                           \
+	                   '$$prefix/doc'                                  \
+	                   '$$prefix/html'                                 \
+	                   '$$prefix/haddock'                              \
+	                   --distpref dist-stage$*                         \
+	                   $(INPLACE_INSTALL_FLAGS)                        \
+	                   $(INSTALL_FLAGS)
+
+# XXX For now we always install the stage 2 compiler
+install:
+	$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+	                   '$(prefix)' '$(bindir)' '$(libdir)'            \
+                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
+                       '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
+	                   --distpref dist-stage2                         \
 	                   $(INSTALL_FLAGS)
 
-# XXX fix:
-#binary-dist:
-#	$(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
-#	$(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
-#	$(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
-#	$(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
-#	$(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+include $(TOP)/mk/bindist.mk
+EXE_DIST_DIR = dist-stage$(stage)