X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.mk;h=a3973bf79db4c07bafdae5ad7ba5621aeb70c8d7;hb=609e7ddfb10bc04762b820e70e0487ad6c514c2e;hp=46b2df5d5721113ce240646019b54af96f31cd1f;hpb=a2797404fc2783552544a38a3e38e16b4dce29a5;p=ghc-hetmet.git

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 46b2df5..a3973bf 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -45,6 +45,10 @@ 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)
@@ -85,6 +89,12 @@ 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)
 
+# 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 1 is enabled unless $(stage) is set to something other than 1
 ifeq "$(filter-out 1,$(stage))" ""
 $(eval $(call build-prog,ghc,stage1,0))
@@ -131,9 +141,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 +159,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