X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fghc.mk;h=2f505cf0c7157120fa033700c690d279028ac75a;hp=4c78e7fecbc7ae8d9281a25f52b867bd6f583be7;hb=f5b3f16c9321a1594ce1ed0b73914feabaa321a8;hpb=24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 4c78e7f..2f505cf 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -89,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))