X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=4b3e05cfb57f86ae8118ba5df57285e2bd55e2a8;hb=bcbd8d8e5f42e11c68d36c601233b37afb2b11be;hp=4d71792ff608b2ce53a5b60d697c206708152481;hpb=8c178b26e4ecfab8d830f77807f64461d3b09703;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4d71792..4b3e05c 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,49 +1,113 @@
-#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.21 2002/07/02 14:15:22 simonmar Exp $
-#
 
-TOP=.
+TOP=..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
 
-#
-# subdir dependencies:
-#	everything needs utils
-#	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 compiler/ and lib/.
-#
-ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes utils rts docs compiler driver
+ifeq "$(stage)" ""
+stage=1
+endif
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INSTALL_FLAGS =
 else
-ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver docs compiler rts
+INSTALL_FLAGS = --enable-shell-wrappers
+endif
+
+boot:
+	@:
+
+all:: build.stage.$(stage)
+
+stage1 ::
+	$(MAKE) stage=1
+
+stage2 ::
+	$(MAKE) stage=2
+
+stage3 ::
+	$(MAKE) stage=3
+
+clean distclean::
+	-$(CABAL) clean --distpref dist-stage1
+	-$(CABAL) clean --distpref dist-stage2
+	$(RM) -rf stage1-inplace
+	$(RM) -rf stage2-inplace
+
+# XXX Eugh, can we do this better? The problem is making extra-gcc-opts
+# infdable on both Linux and Windows. I guess this will go away when we
+# drop the mangler?
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+SET_DATA_SUBDIR = --datasubdir=.
+INPLACE_DATA_DIR = '$$prefix'
 else
-# No RTS for ILX
-SUBDIRS = includes utils driver docs compiler
+SET_DATA_SUBDIR =
+INPLACE_DATA_DIR = '$$prefix/data'
 endif
+
+CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
+
+ifeq "$(GhcWithInterpreter)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --flags=ghci
+else
+CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
 endif
 
-ifeq ($(IncludeTestDirsInBuild),YES)
-SUBDIRS += tests
+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
 
-SRC_DIST_FILES += configure
+CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
 
-DIST_CLEAN_FILES += ghc.spec config.status
+CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
-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
-endif
+# 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.stage.%:
+	$(CABAL) configure --distpref dist-stage$* \
+	                   $(SET_DATA_SUBDIR) \
+	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+	                   $(CONFIGURE_FLAGS_STAGE$*) \
+	                   $(COMMON_CONFIGURE_FLAGS)
+	$(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/bin' \
+	                   '$$prefix/lib' \
+	                   '$$prefix/libexec' \
+	                   '$$prefix/dynlib' \
+	                   $(INPLACE_DATA_DIR) \
+	                   '$$prefix/doc' \
+	                   '$$prefix/html' \
+	                   '$$prefix/haddock' \
+	                   --distpref dist-stage$* \
+	                   $(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/target.mk