--- ./native/jni/Makefile.in.orig	2008-12-03 10:23:58.000000000 -0500
+++ ./native/jni/Makefile.in	2008-12-03 10:24:25.000000000 -0500
@@ -33,7 +33,7 @@ Makefile: Makefile.in
 	( cd ..; ./config.status )
 
 jk_jnicb.la: ${JNI_OBJECTS}
-	$(LIBTOOL) --mode=link $(COMPILE) -module -o $@ -rpath `pwd` -g -O2 -avoid-version ${JNI_OBJECTS} 
+	$(LIBTOOL) --mode=link --tag=CXX $(COMPILE) -module -o $@ -rpath `pwd` -g -O2 -avoid-version ${JNI_OBJECTS} 
 
 jni_connect.so: jk_jnicb.la
 	$(LIBTOOL) --mode=install cp $< `pwd`/jni_connect.so
--- ./native/scripts/build/rules.mk.orig	2008-12-03 10:24:59.000000000 -0500
+++ ./native/scripts/build/rules.mk	2008-12-03 10:25:33.000000000 -0500
@@ -19,7 +19,7 @@
 # Compile commands
 #VPATH=.:../common
 COMPILE      = $(CC) $(CFLAGS)
-LT_COMPILE   = $(LIBTOOL) --mode=compile $(COMPILE) -c $< -o $@
+LT_COMPILE   = $(LIBTOOL) --mode=compile --tag=CXX $(COMPILE) -c $< -o $@
 
 # Implicit rules for creating outputs from input files
 
