From: simonpj@microsoft.com <unknown>
Date: Fri, 29 Sep 2006 22:24:33 +0000 (+0000)
Subject: Fix bug in SCRIPT_SHELL patch (| should be ||)
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a4cf6e78d5a90a670da9db46440115489a19ec94

Fix bug in SCRIPT_SHELL patch (| should be ||)
---

diff --git a/compiler/Makefile b/compiler/Makefile
index 60c70fd..d634828 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -720,7 +720,7 @@ all :: $(odir)/ghc-inplace ghc-inplace
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 #	MSys (...and cygwin with a mingw toolchain)
-SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null | echo "/bin")/sh
+SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
 else
 #	Cygwin and Unix
 SCRIPT_SHELL = /bin/sh