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

[sbp.git] / misc / jvm-bridge.intelmac1.patch

diff --git a/misc/jvm-bridge.intelmac1.patch b/misc/jvm-bridge.intelmac1.patch
deleted file mode 100644 (file)
index 43e29db..0000000
--- a/misc/jvm-bridge.intelmac1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Haskell/Makefile.am        2003-11-03 12:49:54.000000000 -0800
-+++ Haskell/Makefile.am        2006-09-02 23:50:38.000000000 -0700
-@@ -3,7 +3,8 @@
- 
- JVMFILE                       = $(datadir)/current.jvm
- 
--HCPACKAGES            = -package lang -package concurrent
-+#HCPACKAGES           = -package lang -package concurrent
-+HCPACKAGES            = -package rts
- HCIMPORTDIRS  = -i.
- HCCOPTS                       = -I$(includedir_FIX) $${JVM_INCLUDES}
- HCHOPTS                       = -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
-@@ -14,7 +15,7 @@
- 
- CFLAGS                        = -I$(includedir_FIX) -I$(HC_INCDIR)
- 
--BOOTLDFLAGS           = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++
-+BOOTLDFLAGS           = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++ -optl '-fexceptions' 
- BOOTLDFLAGS           += `(test -f $(libdir_FIX)/libjvm_imp.a && echo " -L$(libdir_FIX) -ljvm_imp ") || echo ""`
- 
- BOOT_SRCS = \