projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5012810
)
unbreak mingw-on-cygwin (/=MSYS) builds
author
sof@galois.com
<unknown>
Tue, 26 Sep 2006 16:56:31 +0000
(16:56 +0000)
committer
sof@galois.com
<unknown>
Tue, 26 Sep 2006 16:56:31 +0000
(16:56 +0000)
compiler/Makefile
patch
|
blob
|
history
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
c2cf225
..
60c70fd
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-719,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