# HG changeset patch
# User tbell
# Date 1236035417 28800
# Node ID 0cc0900637a774a4c5b92e27622eeef25486ccbb
# Parent  5da0e6b9f4f18ef483c977337214b12ee0e1fc8f# Parent  280b7d4be00da0b9153c710b30861364b65e1562
Merge

diff -r 5da0e6b9f4f1 -r 0cc0900637a7 corba/make/Makefile
--- a/corba/make/Makefile	Wed Jul 05 16:48:21 2017 +0200
+++ b/corba/make/Makefile	Mon Mar 02 15:10:17 2009 -0800
@@ -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 5da0e6b9f4f1 -r 0cc0900637a7 corba/make/common/shared/Defs-java.gmk
--- a/corba/make/common/shared/Defs-java.gmk	Wed Jul 05 16:48:21 2017 +0200
+++ b/corba/make/common/shared/Defs-java.gmk	Mon Mar 02 15:10:17 2009 -0800
@@ -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