X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=60c70fd9a93d0a67ecf2131e121f641039b48cbd;hb=e6d057711f4d6d6ff6342c39fa2b9e44d25447f1;hp=e81ccfb230a5a143ec3b79b90b9f0aa1ef5c2482;hpb=6fcf90065dc4e75b7dc6bbf238a9891a71ae5a86;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index e81ccfb..60c70fd 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -412,6 +412,8 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
 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.
@@ -717,8 +719,8 @@ all :: $(odir)/ghc-inplace ghc-inplace
 #   (On other system, -W isn't a pwd flag at all.)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-#	MSys
-SCRIPT_SHELL = $(shell cd /bin; pwd -W)/sh
+#	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