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:
e0ab62c
)
Fix bug in SCRIPT_SHELL patch (| should be ||)
author
simonpj@microsoft.com
<unknown>
Fri, 29 Sep 2006 22:24:33 +0000
(22:24 +0000)
committer
simonpj@microsoft.com
<unknown>
Fri, 29 Sep 2006 22:24:33 +0000
(22:24 +0000)
compiler/Makefile
patch
|
blob
|
history
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
60c70fd
..
d634828
100644
(file)
--- 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