diff options
| author | tbell <none@none> | 2009-03-09 23:36:43 -0700 |
|---|---|---|
| committer | tbell <none@none> | 2009-03-09 23:36:43 -0700 |
| commit | 17f2cd059412a4e42f030c2716accef9e8e0dcbf (patch) | |
| tree | a4bf4a1687fa9fe98cd7bdbf6a8377ca6bde91b9 | |
| parent | 78d6d28d268ef516597be9c3cdbc2c6e585bbae1 (diff) | |
| parent | d4afbb2c411c43c1451a4bb81538446689abbbcc (diff) | |
Merge
| -rw-r--r-- | make/Makefile | 2 | ||||
| -rw-r--r-- | make/common/shared/Defs-java.gmk | 5 |
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 |