Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authortbell
Mon, 09 Mar 2009 23:36:43 -0700
changeset 2198 b2a6f1d03263
parent 2193 820a800364b1 (current diff)
parent 2197 ecfcd9ceb34c (diff)
child 2201 222ac40efb53
child 2306 70ca22b481e1
Merge
--- a/corba/make/Makefile	Mon Mar 09 13:33:56 2009 -0700
+++ b/corba/make/Makefile	Mon Mar 09 23:36:43 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:
--- a/corba/make/common/shared/Defs-java.gmk	Mon Mar 09 13:33:56 2009 -0700
+++ b/corba/make/common/shared/Defs-java.gmk	Mon Mar 09 23:36:43 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
jdk-sandbox