projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d2fc6f7
)
runHaskellDemo now works on Intel-Linux
author
adam
<adam@megacz.com>
Mon, 4 Sep 2006 01:50:35 +0000
(21:50 -0400)
committer
adam
<adam@megacz.com>
Mon, 4 Sep 2006 01:50:35 +0000
(21:50 -0400)
darcs-hash:
20060904015035
-5007d-
db3ab84eb67a68397e14ff5be1fd6395ae712488
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
10b833b
..
2ee8bb8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-162,10
+162,12
@@
endif
prefix = $(shell pwd)/prefix
jvm-bridge-site = umn.dl.sourceforge.net
jvm-bridge-url = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
prefix = $(shell pwd)/prefix
jvm-bridge-site = umn.dl.sourceforge.net
jvm-bridge-url = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
+
+# The double -lHaskellJVMBridge is due to a circular link dep; the linux linker gets upset
link = -L$(prefix)/lib/ \
-L$(JAVA_HOME)/jre/lib/i386/ \
-L$(JAVA_HOME)/jre/lib/i386/client/ \
link = -L$(prefix)/lib/ \
-L$(JAVA_HOME)/jre/lib/i386/ \
-L$(JAVA_HOME)/jre/lib/i386/client/ \
- -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation $(jvmlink)
+ -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
packages = -package haskell98 -package base -package rts
ghc = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
bin = $(prefix)/bin/
packages = -package haskell98 -package base -package rts
ghc = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
bin = $(prefix)/bin/