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

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 831e37e..8776566 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -14,6 +14,15 @@
 ghc_USES_CABAL = YES
 ghc_PACKAGE = ghc-bin
 
+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)
@@ -26,11 +35,6 @@ 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_MORE_HC_OPTS += -DGHCI
-ghc_stage3_MORE_HC_OPTS += -DGHCI
-endif
-
 ifeq "$(GhcDebugged)" "YES"
 ghc_stage1_MORE_HC_OPTS += -debug
 ghc_stage2_MORE_HC_OPTS += -debug
@@ -52,29 +56,10 @@ ifeq "$(GhcProfiled)" "YES"
 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_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage1_VERSION)
-ghc_stage2_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage2_VERSION)
-ghc_stage3_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage3_VERSION)
-ghc_stage2_MORE_HC_OPTS += -package haskeline
-ghc_stage3_MORE_HC_OPTS += -package haskeline
-
 ghc_stage1_SHELL_WRAPPER = YES
 ghc_stage2_SHELL_WRAPPER = YES
 ghc_stage3_SHELL_WRAPPER = YES
@@ -109,11 +94,6 @@ $(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))
@@ -133,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