X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=d6348282ce12f26940e450985928ee32a2dd9c36;hp=4d4723ba9ad358b01b22887e7a043d6bff99fb41;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=74c362210577cb1b5aee255dfd4e851720f01363

diff --git a/compiler/Makefile b/compiler/Makefile
index 4d4723b..d634828 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -411,7 +411,9 @@ endif
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
+SRC_HC_OPTS += -DGHCI -package template-haskell
+# -DBREAKPOINT causes a loop in stage2
+# SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
 PKG_DEPENDS += template-haskell
 
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
@@ -702,10 +704,47 @@ SRC_LD_OPTS += -no-link-chk
 
 all :: $(odir)/ghc-inplace ghc-inplace
 
+# MSys notes
+# Note 1
+#   I'm exec'ing $(SCRIPT_SHELL), rather than the usual #!/bin/sh, to make
+#   sure that the right shell is invoked.  If we use /bin/sh, then
+#   when ghc-inplace is invoked from a Cygwin Python (which is the only Python
+#   that seems to run the test-suite correctly), we get the Cygwin shell,
+#   and it in turn interprets the path-names in the second (exec) line
+#   differently to the MSys shell.  That's bad, because ghc-inplace must
+#   also work when invoked from MSys shells
+#
+#   To figure out what the MSys shell is, we cd to '/bin' and do 'pwd -W'
+#   On MSys, the -W flag prints out the directory in c:/msys/bin format
+#   (On other system, -W isn't a pwd flag at all.)
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+#	MSys (...and cygwin with a mingw toolchain)
+SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
+else
+#	Cygwin and Unix
+SCRIPT_SHELL = /bin/sh
+endif
+
+# Note 2
+# On MSys, we must use the following script for ghc-inplace:
+#   exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@"
+# That is, 
+#  (a) You *must* use the /c/ form for the first arg to exec.  Using the
+#      c:/ form makes exec complain that it can't find $pwd/c:/darcs/.../ghc
+#		The /c/ form is $(FPTOOLS_TOP_ABS)
+#  (b) You *must* use the c:/ form for the -B argument, else the testsuite
+#      doesn't work.  I think that's something to do with ghc-inplace being
+#      invoked by Python
+#		The c:/ form is $(FPTOOLS_TOP_ABS_PLATFORM)
+
 $(odir)/ghc-inplace : $(GHC_PROG)
 	@$(RM) $@
-	echo '#!/bin/sh' >>$@
-	echo exec $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
+	echo '#!$(SCRIPT_SHELL)' >>$@
+# Re SCRIPT_SHELL, see note 1 above
+	echo exec  $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) \
+		'-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
+# Re exec, see note 2 above
 	chmod 755 $@
 
 ghc-inplace : stage1/ghc-inplace
@@ -783,7 +822,9 @@ coreSyn/CorePrep_HC_OPTS += -auto-all
 # package build system framework more or less does the right thing for
 # us here.
 
+# 		All this section is stage-2 only!
 ifeq "$(stage)" "2"
+
 PACKAGE = ghc
 HIERARCHICAL_LIB = NO
 VERSION = $(ProjectVersion)
@@ -811,16 +852,19 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
 # Haddock can't handle recursive modules currently, so we disable it for now.
 NO_HADDOCK_DOCS = YES
 
-# Don't build the GHC binary as normal, because we need to link it
-# against the GHC package.  The GHC binary itself is built by
-# compiling Main.o separately and linking it with -package ghc.  This is
-# done using a separate Makefile:
+# The stage 2 GHC binary itself is built by  compiling main/Main.hs 
+# (the same as used in stage 1) against the GHC package.
+#
+# This is done by compiling Main.hs separately and linking it with 
+# -package ghc.  This is done using a separate Makefile, Makefile.ghcbin
+# Why? See comments in Makefile.ghcbin
 
 all :: $(GHC_PROG)
 
 $(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs
 	$(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
 
+# Propagate standard targets to Makefile.ghcbin
 docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt::
 	$(MAKE) -f Makefile.ghcbin $(MFLAGS) $@
 endif