projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make Result.usedByNonDoomedNode() more efficient
[sbp.git]
/
Makefile.haskell
diff --git
a/Makefile.haskell
b/Makefile.haskell
index
29c2c2a
..
fb26049
100644
(file)
--- a/
Makefile.haskell
+++ b/
Makefile.haskell
@@
-3,8
+3,12
@@
ghc_version = $(shell ghc --version | sed 's_.*version \([0-9]*\.[0-9]*\).*_\1_'
ifeq ($(ghc_version),6.5)
patchghc = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
else
ifeq ($(ghc_version),6.5)
patchghc = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
else
+ifeq ($(ghc_version),6.6)
+patchghc = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
+else
patchghc =
endif
patchghc =
endif
+endif
ifeq ($(shell uname),Darwin)
with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
ifeq ($(shell uname),Darwin)
with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/