projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix scoped type variables for expression type signatures
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
e81ccfb
..
d634828
100644
(file)
--- 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
# 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.
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"
# (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
else
# Cygwin and Unix
SCRIPT_SHELL = /bin/sh