equal
deleted
inserted
replaced
126 JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)" |
126 JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)" |
127 JAVACFLAGS += $(OTHER_JAVACFLAGS) |
127 JAVACFLAGS += $(OTHER_JAVACFLAGS) |
128 |
128 |
129 # Needed for javah |
129 # Needed for javah |
130 JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) |
130 JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) |
|
131 |
|
132 # Needed for JAVADOC and BOOT_JAVACFLAGS |
|
133 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true |
131 |
134 |
132 # Langtools |
135 # Langtools |
133 ifdef LANGTOOLS_DIST |
136 ifdef LANGTOOLS_DIST |
134 JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar |
137 JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar |
135 JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar |
138 JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar |
190 BOOT_JAVACFLAGS += -Werror |
193 BOOT_JAVACFLAGS += -Werror |
191 endif |
194 endif |
192 BOOT_JAVACFLAGS += -encoding ascii |
195 BOOT_JAVACFLAGS += -encoding ascii |
193 BOOT_JAR_JFLAGS += $(JAR_JFLAGS) |
196 BOOT_JAR_JFLAGS += $(JAR_JFLAGS) |
194 |
197 |
|
198 BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) |
|
199 |
195 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS) |
200 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS) |
196 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS) |
201 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS) |
197 BOOT_JAR_CMD = $(BOOTDIR)/bin/jar |
202 BOOT_JAR_CMD = $(BOOTDIR)/bin/jar |
198 BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner |
203 BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner |
199 |
204 |