X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.mk;h=02033444b11d7ed3d06dcc6dc72013068357aa16;hb=aaae1a912d4e82de81a02ff03328e3ad363c77cb;hp=1bda27bfee8d04df9ff5463982d26e16a34cecbb;hpb=7c2ca0ef7de0bdb5d059a4d714f807cd7c710616;p=ghc-hetmet.git

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 1bda27b..0203344 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -18,6 +18,14 @@ ghc_stage1_HC_OPTS = $(GhcStage1HcOpts)
 ghc_stage2_HC_OPTS = $(GhcStage2HcOpts)
 ghc_stage3_HC_OPTS = $(GhcStage3HcOpts)
 
+ghc_stage2_CC_OPTS = -Iincludes
+ghc_stage3_CC_OPTS = -Iincludes
+
+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
@@ -33,8 +41,9 @@ ghc_stage2_HC_OPTS += -threaded
 ghc_stage3_HC_OPTS += -threaded
 endif
 
-# XXX ToDp
-# ifeq "$(GhcProfiled)" "YES"
+ifeq "$(GhcProfiled)" "YES"
+ghc_stage2_HC_OPTS += -prof
+endif
 
 ghc_stage1_MODULES = Main
 
@@ -44,12 +53,15 @@ 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_USE_BOOT_LIBS = YES
 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)
@@ -85,20 +97,28 @@ ghc_stage3_SHELL_WRAPPER_NAME = ghc/ghc.wrapper
 ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER = YES
 ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_NAME = ghc-$(ProjectVersion)
 
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-prog,ghc,stage1,0))
-endif
+# We override the program name to be ghc, rather than ghc-stage2.
+# This means the right program name is used in error messages etc.
+define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
+echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
+endef
 
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-prog,ghc,stage2,1))
+# 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
-
-# stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-prog,ghc,stage3,2))
+ifeq "$(stage)" "2"
+ghc_stage1_NOT_NEEDED = YES
+endif
+# We don't want the rules for stage3 unless we have been explicitly
+# asked to build it
+ifneq "$(stage)" "3"
+ghc_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-prog,ghc,stage1,0))
+$(eval $(call build-prog,ghc,stage2,1))
+$(eval $(call build-prog,ghc,stage3,2))
 
 ifneq "$(BINDIST)" "YES"
 
@@ -108,9 +128,9 @@ ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_v_LIB)
 ghc/stage3/build/tmp/$(ghc_stage3_PROG) : $(compiler_stage3_v_LIB)
 
 # Modules here import HsVersions.h, so we need ghc_boot_platform.h
-$(ghc_stage1_depfile) : compiler/stage1/$(PLATFORM_H)
-$(ghc_stage2_depfile) : compiler/stage2/$(PLATFORM_H)
-$(ghc_stage3_depfile) : compiler/stage3/$(PLATFORM_H)
+$(ghc_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H)
+$(ghc_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H)
+$(ghc_stage3_depfile_haskell) : compiler/stage3/$(PLATFORM_H)
 
 all_ghc_stage1 : $(GHC_STAGE1)
 all_ghc_stage2 : $(GHC_STAGE2)
@@ -131,9 +151,9 @@ $(GHC_STAGE2) : $(INPLACE_LIB)/extra-gcc-opts
 $(GHC_STAGE3) : $(INPLACE_LIB)/extra-gcc-opts
 
 ifeq "$(Windows)" "YES"
-$(GHC_STAGE1) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe
-$(GHC_STAGE2) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe
-$(GHC_STAGE3) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe
+$(GHC_STAGE1) : $(TOUCHY)
+$(GHC_STAGE2) : $(TOUCHY)
+$(GHC_STAGE3) : $(TOUCHY)
 endif
 
 ifeq "$(BootingFromHc)" "YES"
@@ -149,8 +169,8 @@ ifeq "$(Windows)" "NO"
 install: install_ghc_link
 .PNONY: install_ghc_link
 install_ghc_link: 
-	"$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc
-	$(LN_S) ghc-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc
+	"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghc"
+	$(LN_S) ghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghc"
 else
 # On Windows we install the main binary as $(bindir)/ghc.exe
 # To get ghc-<version>.exe we have a little C program in driver/ghc