projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d6f5a5
)
use ghc-6.5 patch with ghc-6.6
author
adam
<adam@megacz.com>
Mon, 30 Oct 2006 05:21:31 +0000
(
00:21
-0500)
committer
adam
<adam@megacz.com>
Mon, 30 Oct 2006 05:21:31 +0000
(
00:21
-0500)
darcs-hash:
20061030052131
-5007d-
7e1f2ca05934ccd33c05c1b0130b1ac525ef55c4
.gz
Makefile.haskell
patch
|
blob
|
history
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/