diff options
| author | katleman <none@none> | 2013-02-05 18:54:11 -0800 |
|---|---|---|
| committer | katleman <none@none> | 2013-02-05 18:54:11 -0800 |
| commit | 8ae9a3bec9c8d79127c23071cb59399e8e7a4d95 (patch) | |
| tree | d376116ffd08a96f691c5f7ba078492fd073b8d6 | |
| parent | 88d6a3895be7d86441fba65a4a56b5303eecd69a (diff) | |
| parent | 97a55a4ff92ed32dd4cf148b1adabe6ff6990cc7 (diff) | |
Mergejdk8-b76
| -rw-r--r-- | makefiles/BuildCorba.gmk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/makefiles/BuildCorba.gmk b/makefiles/BuildCorba.gmk index 246c5b9..b177ff2 100644 --- a/makefiles/BuildCorba.gmk +++ b/makefiles/BuildCorba.gmk @@ -35,8 +35,6 @@ include MakeBase.gmk include JavaCompilation.gmk include IdlCompilation.gmk -JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ - -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar # The Corba sources are old and generates a LOT of warnings. # Disable these using Xlint, until someone cares to fix them. DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann @@ -46,7 +44,7 @@ DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough, # Thus we force the target bytecode to the boot jdk bytecode. $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ JVM:=$(JAVA),\ - JAVAC:=$(JAVAC_JARS),\ + JAVAC:=$(NEW_JAVAC),\ FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) @@ -56,7 +54,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ # cannot necessarily be run with the boot jdk. $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ JVM:=$(JAVA),\ - JAVAC:=$(JAVAC_JARS),\ + JAVAC:=$(NEW_JAVAC),\ FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |