1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Tim Bell 2009-03-09 23:36:43 -07:00
commit 308015e275
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
corba/make/Makefile
View File

@ -112,8 +112,6 @@ ifndef TARGET_JAVA
TARGET_JAVA = java TARGET_JAVA = java
endif endif
NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
SELF = $(lastword $(MAKEFILE_LIST)) SELF = $(lastword $(MAKEFILE_LIST))
# for jdk, we generate the following: # for jdk, we generate the following:

5
corba/make/common/shared/Defs-java.gmk
View File

@ -104,6 +104,9 @@ ifeq ($(COMPILER_WARNINGS_FATAL), true)
JAVACFLAGS += -Werror JAVACFLAGS += -Werror
endif 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?) # Add the source level (currently all source is 1.5, should this be 1.6?)
LANGUAGE_VERSION = -source 1.5 LANGUAGE_VERSION = -source 1.5
JAVACFLAGS += $(LANGUAGE_VERSION) JAVACFLAGS += $(LANGUAGE_VERSION)
@ -117,7 +120,7 @@ JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
JAVACFLAGS += $(OTHER_JAVACFLAGS) JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah # Needed for javah
JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) JAVAHFLAGS += -classpath $(CLASSBINDIR)
# Langtools # Langtools
ifdef LANGTOOLS_DIST ifdef LANGTOOLS_DIST