X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.mk;h=8776566106c1cbf7480fb9a1a737ff5ad56a9c75;hb=fd26d0ac1b48890dc7c3b5b60b42373fa964cdc8;hp=02033444b11d7ed3d06dcc6dc72013068357aa16;hpb=a19691137898050be08580092ed6f22213f66c27;p=ghc-hetmet.git

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 0203344..8776566 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -11,12 +11,21 @@
 # -----------------------------------------------------------------------------
 
 # ToDo
-ghc_USES_CABAL = NO
-# ghc_PACKAGE = ghc-bin
+ghc_USES_CABAL = YES
+ghc_PACKAGE = ghc-bin
 
-ghc_stage1_HC_OPTS = $(GhcStage1HcOpts)
-ghc_stage2_HC_OPTS = $(GhcStage2HcOpts)
-ghc_stage3_HC_OPTS = $(GhcStage3HcOpts)
+ghc_stage1_CONFIGURE_OPTS += --flags=stage1
+ghc_stage2_CONFIGURE_OPTS += --flags=stage2
+ghc_stage3_CONFIGURE_OPTS += --flags=stage3
+
+ifeq "$(GhcWithInterpreter)" "YES"
+ghc_stage2_CONFIGURE_OPTS += --flags=ghci
+ghc_stage3_CONFIGURE_OPTS += --flags=ghci
+endif
+
+ghc_stage1_MORE_HC_OPTS = $(GhcStage1HcOpts)
+ghc_stage2_MORE_HC_OPTS = $(GhcStage2HcOpts)
+ghc_stage3_MORE_HC_OPTS = $(GhcStage3HcOpts)
 
 ghc_stage2_CC_OPTS = -Iincludes
 ghc_stage3_CC_OPTS = -Iincludes
@@ -26,67 +35,31 @@ ghc_stage1_C_FILES_NODEPS = ghc/hschooks.c
 ghc_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 ghc_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 
-ifeq "$(GhcWithInterpreter)" "YES"
-ghc_stage2_HC_OPTS += -DGHCI
-ghc_stage3_HC_OPTS += -DGHCI
+ifeq "$(GhcDebugged)" "YES"
+ghc_stage1_MORE_HC_OPTS += -debug
+ghc_stage2_MORE_HC_OPTS += -debug
+ghc_stage3_MORE_HC_OPTS += -debug
 endif
 
-ifeq "$(GhcDebugged)" "YES"
-ghc_HC_OPTS += -debug
+ifeq "$(GhcDynamic)" "YES"
+ghc_stage2_MORE_HC_OPTS += -dynamic
+ghc_stage3_MORE_HC_OPTS += -dynamic
 endif
 
 ifeq "$(GhcThreaded)" "YES"
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
-ghc_stage2_HC_OPTS += -threaded
-ghc_stage3_HC_OPTS += -threaded
+ghc_stage2_MORE_HC_OPTS += -threaded
+ghc_stage3_MORE_HC_OPTS += -threaded
 endif
 
 ifeq "$(GhcProfiled)" "YES"
-ghc_stage2_HC_OPTS += -prof
+ghc_stage2_MORE_HC_OPTS += -prof
 endif
 
-ghc_stage1_MODULES = Main
-
-ghc_stage2_MODULES = $(ghc_stage1_MODULES)
-ifeq "$(GhcWithInterpreter)" "YES"
-ghc_stage2_MODULES += GhciMonad GhciTags InteractiveUI
-endif
-ghc_stage3_MODULES = $(ghc_stage2_MODULES)
-
-ghc_stage1_C_SRCS = hschooks.c
-ghc_stage2_C_SRCS = hschooks.c
-ghc_stage3_C_SRCS = hschooks.c
-
 ghc_stage1_PROG = ghc-stage1$(exeext)
 ghc_stage2_PROG = ghc-stage2$(exeext)
 ghc_stage3_PROG = ghc-stage3$(exeext)
 
-# ToDo: perhaps use ghc-cabal to configure ghc-bin
-ghc_stage1_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage1_VERSION)
-ghc_stage2_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage2_VERSION)
-ghc_stage3_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage3_VERSION)
-ghc_stage2_HC_OPTS += -package haskeline
-ghc_stage3_HC_OPTS += -package haskeline
-
-ghc_language_extension_flags = -XCPP \
-                               -XPatternGuards \
-                               -XForeignFunctionInterface \
-                               -XUnboxedTuples \
-                               -XFlexibleInstances \
-                               -XMagicHash
-ghc_stage1_HC_OPTS += $(ghc_language_extension_flags)
-ghc_stage2_HC_OPTS += $(ghc_language_extension_flags)
-ghc_stage3_HC_OPTS += $(ghc_language_extension_flags)
-
-# In stage1 we might not benefit from cross-package dependencies and
-# recompilation checking.  We must force recompilation here, otherwise
-# Main.o won't necessarily be rebuilt when the ghc package has changed:
-ghc_stage1_HC_OPTS += -fforce-recomp
-
-# Further dependencies we need only in stage 1, due to no
-# cross-package dependencies or recompilation checking.
-ghc/stage1/build/Main.o : $(compiler_stage1_v_LIB)
-
 ghc_stage1_SHELL_WRAPPER = YES
 ghc_stage2_SHELL_WRAPPER = YES
 ghc_stage3_SHELL_WRAPPER = YES
@@ -103,16 +76,15 @@ define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
 echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
 endef
 
-# If we "make 1" or "make 2" then we don't want the rules for the stage
-# that we haven't been asked to build
-ifeq "$(stage)" "1"
-ghc_stage2_NOT_NEEDED = YES
-endif
-ifeq "$(stage)" "2"
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
 ghc_stage1_NOT_NEEDED = YES
 endif
-# We don't want the rules for stage3 unless we have been explicitly
-# asked to build it
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+ghc_stage2_NOT_NEEDED = YES
+endif
+# stage 3 has to be requested explicitly with stage=3
 ifneq "$(stage)" "3"
 ghc_stage3_NOT_NEEDED = YES
 endif
@@ -122,10 +94,10 @@ $(eval $(call build-prog,ghc,stage3,2))
 
 ifneq "$(BINDIST)" "YES"
 
-# ToDo: should we add these in the build-prog macro?
-ghc/stage1/build/tmp/$(ghc_stage1_PROG) : $(compiler_stage1_v_LIB)
-ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_v_LIB)
-ghc/stage3/build/tmp/$(ghc_stage3_PROG) : $(compiler_stage3_v_LIB)
+ifeq "$(GhcProfiled)" "YES"
+ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_p_LIB)
+ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_p_LIB))
+endif
 
 # Modules here import HsVersions.h, so we need ghc_boot_platform.h
 $(ghc_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H)
@@ -141,9 +113,9 @@ $(INPLACE_LIB)/extra-gcc-opts : extra-gcc-opts
 
 # The GHC programs need to depend on all the helper programs they might call
 ifeq "$(GhcUnregisterised)" "NO"
-$(GHC_STAGE1) : $(MANGLER) $(SPLIT)
-$(GHC_STAGE2) : $(MANGLER) $(SPLIT)
-$(GHC_STAGE3) : $(MANGLER) $(SPLIT)
+$(GHC_STAGE1) : $(SPLIT)
+$(GHC_STAGE2) : $(SPLIT)
+$(GHC_STAGE3) : $(SPLIT)
 endif
 
 $(GHC_STAGE1) : $(INPLACE_LIB)/extra-gcc-opts