aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortbell <none@none>2009-03-06 10:52:02 -0800
committertbell <none@none>2009-03-06 10:52:02 -0800
commitd4afbb2c411c43c1451a4bb81538446689abbbcc (patch)
tree83295f30f9c0add4d023e1aa0d7b1cc1df50a7c6
parent63bcab230d95141d2c13277eccdfc102a7a78c32 (diff)
parent0fa3b4f0ff3d106ad281979815e645cf1c0a0c8b (diff)
Merge
-rw-r--r--make/Makefile2
-rw-r--r--make/common/shared/Defs-java.gmk5
2 files changed, 4 insertions, 3 deletions
diff --git a/make/Makefile b/make/Makefile
index 0b5c31d..5eebabb 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -112,8 +112,6 @@ ifndef TARGET_JAVA
TARGET_JAVA = java
endif
-NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
-
SELF = $(lastword $(MAKEFILE_LIST))
# for jdk, we generate the following:
diff --git a/make/common/shared/Defs-java.gmk b/make/common/shared/Defs-java.gmk
index f811bee..f80f0ff 100644
--- a/make/common/shared/Defs-java.gmk
+++ b/make/common/shared/Defs-java.gmk
@@ -104,6 +104,9 @@ ifeq ($(COMPILER_WARNINGS_FATAL), true)
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 += -classpath $(BOOTDIR)/lib/tools.jar
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVAHFLAGS += -classpath $(CLASSBINDIR)
# Langtools
ifdef LANGTOOLS_DIST