From: sof@galois.com <unknown>
Date: Tue, 26 Sep 2006 16:56:31 +0000 (+0000)
Subject: unbreak mingw-on-cygwin (/=MSYS) builds
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=b4af1a0ff3d43e70e54629e89ffff62d49de1746

unbreak mingw-on-cygwin (/=MSYS) builds
---

diff --git a/compiler/Makefile b/compiler/Makefile
index c2cf225..60c70fd 100644
--- 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"
-#	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