Fix bug in SCRIPT_SHELL patch (| should be ||)
authorsimonpj@microsoft.com <unknown>
Fri, 29 Sep 2006 22:24:33 +0000 (22:24 +0000)
committersimonpj@microsoft.com <unknown>
Fri, 29 Sep 2006 22:24:33 +0000 (22:24 +0000)
compiler/Makefile

index 60c70fd..d634828 100644 (file)
@@ -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