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

[sbp.git] / misc / ghc-6.5-patch

diff --git a/misc/jvm-bridge.intelmac2.patch b/misc/ghc-6.5-patch
similarity index 79%
rename from misc/jvm-bridge.intelmac2.patch
rename to misc/ghc-6.5-patch
index 86f5fa9..c1b7007 100644 (file)
--- a/misc/jvm-bridge.intelmac2.patch
+++ b/misc/ghc-6.5-patch
@@ -10,15 +10,6 @@
  HCIMPORTDIRS  = -i.
  HCCOPTS                       = -I$(includedir_FIX) $${JVM_INCLUDES}
  HCHOPTS                       = -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
-@@ -15,7 +14,7 @@
- 
- CFLAGS                        = -I$(includedir_FIX) -I$(HC_INCDIR)
- 
-+BOOTLDFLAGS           = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation -framework JavaVM -optl -fexceptions  -lstdc++ -optl '-fexceptions' 
--BOOTLDFLAGS           = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++
- BOOTLDFLAGS           += `(test -f $(libdir_FIX)/libjvm_imp.a && echo " -L$(libdir_FIX) -ljvm_imp ") || echo ""`
- 
- BOOT_SRCS = \
 diff -u ./MonadException.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/MonadException.hs
 --- Haskell/MonadException.hs  2006-09-02 23:42:19.000000000 -0700
 +++ Haskell/MonadException.hs  2002-01-28 18:21:35.000000000 -0800
@@ -57,3 +48,4 @@ diff -u ./TypedLayer.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedLayer.hs
  
        runJavaClass :: (IsJVMMonad m) => ClassName -> [JString] -> m ();
        runJavaClass className args = do
+