X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=3c215a3840297de03deafffe7362668664bb36a1;hb=41ea53bfeccbb2fd33e5408f1dde47b0770d30e2;hp=8c83dcd479b71d1f7620ded092c63de56cef689b;hpb=03742521b5bc684add386d6f52ffda97063ba290;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 8c83dcd..3c215a3 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,53 +1,132 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.26 2004/11/11 09:36:55 simonmar Exp $
-#
 
-TOP=.
+TOP=..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
 
-#
-# subdir dependencies:
-#	everything needs utils
-#	utils needs lib
-#	includes/ needs driver (to easily c.pile mkNativeGen.c)
-#	make depend except in {utils,driver} needs includes	
-#	RTS and compiler need includes
-#
-
-#
-# Order is important! It's e.g. necessary to descend into include/
-# before the rest to have a config.h, etc.
-#
-# If we're booting from .hc files, swap the order
-# we descend into subdirs - to boot utils must be before driver.
-#
-ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes rts docs compiler lib utils driver
+ifeq "$(stage)" ""
+stage=1
+endif
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INSTALL_FLAGS =
 else
-ifneq "$(ILXized)" "YES"
-SUBDIRS = includes lib utils driver docs compiler rts
+INSTALL_FLAGS = --enable-shell-wrappers
+endif
+
+# Don't strip the inplace versions, we might need to debug them
+INPLACE_INSTALL_FLAGS += --disable-executable-stripping
+
+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
+
+stage2 ::
+	$(MAKE) stage=2
+
+stage3 ::
+	$(MAKE) stage=3
+
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
+clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
+else
+clean distclean:: clean.stage.$(stage)
+endif
+
+clean.stage.%:
+	-$(CABAL) clean --distpref dist-stage$*
+	$(RM) -rf stage$*-inplace
+
+CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
+
+ifeq "$(GhcWithInterpreter)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --flags=ghci
 else
-# No RTS for ILX
-SUBDIRS = includes lib utils driver docs compiler
+CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
 endif
+
+ifeq "$(GhcProfiled)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --enable-executable-profiling
+endif
+ifeq "$(GhcDebugged)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-debug
+endif
+ifeq "$(GhcThreaded)" "YES"
+# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
 endif
 
-ifeq ($(IncludeTestDirsInBuild),YES)
-SUBDIRS += tests
+ifeq "$(BuildSharedLibs)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-dynamic
 endif
 
-SRC_DIST_FILES += configure
+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)
 
-DIST_CLEAN_FILES += config.cache config.status ghc.spec
+# 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))
 
-extraclean::
-	$(RM) -rf autom4te.cache
+# 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
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-# These files need to be in the InstallShield
-# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
-# in the top-level directory of the distribution
-INSTALL_DATAS += ANNOUNCE LICENSE README VERSION
+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) \
+	                   $(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/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)
+
+include $(TOP)/mk/bindist.mk
+EXE_DIST_DIR = dist-stage$(stage)
 
-include $(TOP)/mk/target.mk