X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=misc%2Fghc-6.5-patch;fp=misc%2Fjvm-bridge.intelmac2.patch;h=c1b70076a9e3052cd4c0403b21ec2498b3693181;hp=86f5fa99e25663b23ce9836163ea4a07ab3927f4;hb=d2fc6f76cce121e8f6c35af5c733c4269829f82c;hpb=85016412a8eb6bfd0a4bd57a01a966ca9c5302f7

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
--- 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
+