add support for ghc6.5 and IntelMac
[sbp.git] / misc / jvm-bridge.intelmac1.patch
1 --- Haskell/Makefile.am 2003-11-03 12:49:54.000000000 -0800
2 +++ Haskell/Makefile.am 2006-09-02 23:50:38.000000000 -0700
3 @@ -3,7 +3,8 @@
4  
5  JVMFILE                        = $(datadir)/current.jvm
6  
7 -HCPACKAGES             = -package lang -package concurrent
8 +#HCPACKAGES            = -package lang -package concurrent
9 +HCPACKAGES             = -package rts
10  HCIMPORTDIRS   = -i.
11  HCCOPTS                        = -I$(includedir_FIX) $${JVM_INCLUDES}
12  HCHOPTS                        = -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
13 @@ -14,7 +15,7 @@
14  
15  CFLAGS                 = -I$(includedir_FIX) -I$(HC_INCDIR)
16  
17 -BOOTLDFLAGS            = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++
18 +BOOTLDFLAGS            = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++ -optl '-fexceptions' 
19  BOOTLDFLAGS            += `(test -f $(libdir_FIX)/libjvm_imp.a && echo " -L$(libdir_FIX) -ljvm_imp ") || echo ""`
20  
21  BOOT_SRCS = \