From: adam <adam@megacz.com>
Date: Mon, 4 Sep 2006 01:50:35 +0000 (-0400)
Subject: runHaskellDemo now works on Intel-Linux
X-Git-Tag: tag_for_25-Mar~77
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=d6c55258bdfa1d46c471773c7f6095a6d1b7c46c;hp=d2fc6f76cce121e8f6c35af5c733c4269829f82c

runHaskellDemo now works on Intel-Linux

darcs-hash:20060904015035-5007d-db3ab84eb67a68397e14ff5be1fd6395ae712488.gz
---

diff --git a/Makefile b/Makefile
index 10b833b..2ee8bb8 100644
--- 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
+
+#		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/ \
-                  -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/