OpenJDK / amber / amber
changeset 13708:47359a0d4d6e
7197849: Update new build-infra makefiles
Reviewed-by: ihse, erikj, ohrstrom, tbell
| author | ohair |
|---|---|
| date | Tue, 18 Sep 2012 11:29:51 -0700 |
| parents | ffe6bce5a521 |
| children | 9674d32cdc2a |
| files | corba/makefiles/Makefile |
| diffstat | 1 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/corba/makefiles/Makefile Wed Jul 05 18:22:17 2017 +0200 +++ b/corba/makefiles/Makefile Tue Sep 18 11:29:51 2012 -0700 @@ -48,10 +48,8 @@ JVM:=$(JAVA),\ JAVAC:=$(JAVAC_JARS),\ FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ - SERVER_DIR:=$(JAVAC_SERVERS),\ - SERVER_JVM:=$(SERVER_JAVA),\ - MODE:=$(JAVAC_USE_MODE),\ - USE_DEPS:=$(JAVAC_USE_DEPS))) + SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ + SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) # The "generate new bytecode" uses the new compiler to generate bytecode # for the new jdk that is being built. The code compiled by this setup @@ -59,13 +57,9 @@ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ JVM:=$(JAVA),\ JAVAC:=$(JAVAC_JARS),\ - FLAGS:=-Xprefer:source -XDignore.symbol.file=true \ - -cp $(BOOT_JDK)/lib/tools.jar \ - $(DISABLE_CORBA_WARNINGS),\ - SERVER_DIR:=$(JAVAC_SERVERS),\ - SERVER_JVM:=$(SERVER_JAVA),\ - MODE:=$(JAVAC_USE_MODE),\ - USE_DEPS:=$(JAVAC_USE_DEPS))) + FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ + SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ + SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ SETUP:=GENERATE_OLDBYTECODE,\