modularize the IntelMac hack, should now work on all Macs with ghc6.5

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 205b410..10b833b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -139,23 +139,35 @@ upload:
 ##   make runHaskellDemo JAVA_HOME=<java-home>
 ##
 
+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
+patchghc    =
+endif
+
 ifeq ($(shell uname),Darwin)
 with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
 jvmlink     = -framework JavaVM -optl -fexceptions
+patchmac    = patch -p0 < $(shell pwd)/misc/intel-mac-patch &&
+linkopts    =
 else
 with_jvmdir = --with-jvmdir=$(JAVA_HOME)
 jvmlink     = -ljava -ljvm -lverify
+patchmac    =
+linkopts    = -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/" -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/client/"
 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
 link            = -L$(prefix)/lib/ \
-                   -L$(JAVA_HOME)/jre/lib/i386/ \
-                   -L$(JAVA_HOME)/jre/lib/i386/client/ \
-                   -lstdc++ -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
-packages        = -package haskell98 -package base -package rts -package rts
-ghc             = ghc -fglasgow-exts $(packages) $(link) -i$(prefix)/imports/
+                  -L$(JAVA_HOME)/jre/lib/i386/ \
+                  -L$(JAVA_HOME)/jre/lib/i386/client/ \
+                  -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation $(jvmlink)
+packages        = -package haskell98 -package base -package rts
+ghc             = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
 bin             = $(prefix)/bin/
 
 .jvm-bridge:
@@ -165,8 +177,9 @@ bin             = $(prefix)/bin/
                curl $(jvm-bridge-url) | tar -xvzf -
 
        cd $(prefix)/src/haskell-jvm-bridge-*; \
-               patch -p0 < $(shell pwd)/misc/jvm-bridge.patch && \
-               patch -p0 < $(shell pwd)/misc/jvm-bridge.intelmac2.patch && \
+               patch -p0 < $(shell pwd)/misc/broken-cygwin-detection-patch && \
+               $(patchmac) \
+               $(patchghc) \
                (cd Native; autoreconf; true) && \
                (cd Haskell; autoreconf; true)
 
@@ -185,19 +198,19 @@ bin             = $(prefix)/bin/
 runHaskellDemo: .jvm-bridge
        mkdir -p bin
        make bin/HaskellDemo
-       LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/usr/lib/:$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/client bin/HaskellDemo
+       bin/HaskellDemo
 
 bin/Header_%.o: edu.berkeley.sbp.jar .jvm-bridge
        cd bin; $(bin)/MakeHeaderModule -module Header_$* -jar ../edu.berkeley.sbp.jar
-       cd bin; $(ghc) -c Header_$*.hs
+       cd bin; $(ghc) -c Header_$*.hs $(link)
 
 bin/Class_%.o: bin/Header_%.o
        cd bin; $(bin)/MakeClassModule -import Header_Java -import Header_$* -cp ../edu.berkeley.sbp.jar `echo $* | sed s/_/./g`
-       cd bin; $(ghc) -c Class_$*.hs
+       cd bin; $(ghc) -c Class_$*.hs $(link)
 
 bin/JVM_%.o: bin/Class_%.o
        cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
-       cd bin; $(ghc) -c JVM_$*.hs
+       cd bin; $(ghc) -c JVM_$*.hs $(link)
 
 edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
 
@@ -206,6 +219,6 @@ bin/HaskellDemo: src/HaskellDemo.hs \
                bin/Class_java_lang_String.o \
                bin/Class_edu_berkeley_sbp_Tree.o \
                bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
-       cd bin; $(ghc) -c ../src/HaskellDemo.hs -o HaskellDemo.o
-       cd bin; for A in *.hs; do $(ghc) -c $$A; done
-       cd bin; $(ghc) -o HaskellDemo *.o
+       cd bin; $(ghc) -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
+       cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
+       cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o