Mercurial > hg > release > icedtea7-forest-2.1 > corba
changeset 54:c471ac1a1770
Merge
author | tbell |
---|---|
date | Mon, 09 Mar 2009 23:36:43 -0700 |
parents | 3174f87bcd7c (current diff) ec634b3aa302 (diff) |
children | 3eb8f1047a74 126389a38e7d |
files | |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Mon Mar 09 13:33:56 2009 -0700 +++ b/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/make/common/shared/Defs-java.gmk Mon Mar 09 13:33:56 2009 -0700 +++ b/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