X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=d6348282ce12f26940e450985928ee32a2dd9c36;hb=cb5e627211db27c91450b897734d79f1fcd43a16;hp=43622c3a5d1bcfef2df0b786e341db160c6d10bb;hpb=6f873493416ccb4d277377bf031639bc307c8369;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 43622c3..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.
@@ -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