# HG changeset patch
# User xdono
# Date 1237245490 25200
# Node ID 222ac40efb5351e96e5804c7d5a64e57b550a000
# Parent  69f669804c0aba5b6805e8be3611bbccd976507d# Parent  b2a6f1d03263f1971ac324a2b67db75b0963d6f3
Merge

diff -r 69f669804c0a -r 222ac40efb53 corba/make/Makefile
--- a/corba/make/Makefile	Wed Mar 11 17:31:56 2009 -0700
+++ b/corba/make/Makefile	Mon Mar 16 16:18:10 2009 -0700
@@ -112,8 +112,6 @@
   TARGET_JAVA = java
 endif
 
-NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
-
 SELF = $(lastword $(MAKEFILE_LIST))
 
 # for jdk, we generate the following:
diff -r 69f669804c0a -r 222ac40efb53 corba/make/common/shared/Defs-java.gmk
--- a/corba/make/common/shared/Defs-java.gmk	Wed Mar 11 17:31:56 2009 -0700
+++ b/corba/make/common/shared/Defs-java.gmk	Mon Mar 16 16:18:10 2009 -0700
@@ -104,6 +104,9 @@
   JAVACFLAGS  += -Werror
 endif
 
+NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
+JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
+
 # Add the source level (currently all source is 1.5, should this be 1.6?)
 LANGUAGE_VERSION = -source 1.5
 JAVACFLAGS  += $(LANGUAGE_VERSION)
@@ -117,7 +120,7 @@
 JAVACFLAGS  += $(OTHER_JAVACFLAGS)
 
 # Needed for javah
-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVAHFLAGS += -classpath $(CLASSBINDIR)
 
 # Langtools
 ifdef LANGTOOLS_DIST