Mercurial > jdk8-mips64-public > corba / file comparison
comparison: makefiles/BuildCorba.gmk
makefiles/BuildCorba.gmk
- changeset 431
- ce106b6b7394
- parent 413
- de2b8def2be5
- child 509
- 66fc1a749867
- child 527
- 438c54c148a6
equal
deleted
inserted
replaced
| 429:d4e68ce17795 | 431:ce106b6b7394 |
|---|---|
| 33 include $(SPEC) | 33 include $(SPEC) |
| 34 include MakeBase.gmk | 34 include MakeBase.gmk |
| 35 include JavaCompilation.gmk | 35 include JavaCompilation.gmk |
| 36 include IdlCompilation.gmk | 36 include IdlCompilation.gmk |
| 37 | 37 |
| 38 JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ | |
| 39 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar | |
| 40 # The Corba sources are old and generates a LOT of warnings. | 38 # The Corba sources are old and generates a LOT of warnings. |
| 41 # Disable these using Xlint, until someone cares to fix them. | 39 # Disable these using Xlint, until someone cares to fix them. |
| 42 DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann | 40 DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann |
| 43 | 41 |
| 44 # The "generate old bytecode" javac setup uses the new compiler to compile for the | 42 # The "generate old bytecode" javac setup uses the new compiler to compile for the |
| 45 # boot jdk to generate tools that need to be run with the boot jdk. | 43 # boot jdk to generate tools that need to be run with the boot jdk. |
| 46 # Thus we force the target bytecode to the boot jdk bytecode. | 44 # Thus we force the target bytecode to the boot jdk bytecode. |
| 47 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ | 45 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
| 48 JVM:=$(JAVA),\ | 46 JVM:=$(JAVA),\ |
| 49 JAVAC:=$(JAVAC_JARS),\ | 47 JAVAC:=$(NEW_JAVAC),\ |
| 50 FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ | 48 FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ |
| 51 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ | 49 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
| 52 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) | 50 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
| 53 | 51 |
| 54 # The "generate new bytecode" uses the new compiler to generate bytecode | 52 # The "generate new bytecode" uses the new compiler to generate bytecode |
| 55 # for the new jdk that is being built. The code compiled by this setup | 53 # for the new jdk that is being built. The code compiled by this setup |
| 56 # cannot necessarily be run with the boot jdk. | 54 # cannot necessarily be run with the boot jdk. |
| 57 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ | 55 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ |
| 58 JVM:=$(JAVA),\ | 56 JVM:=$(JAVA),\ |
| 59 JAVAC:=$(JAVAC_JARS),\ | 57 JAVAC:=$(NEW_JAVAC),\ |
| 60 FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ | 58 FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ |
| 61 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ | 59 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
| 62 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) | 60 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
| 63 | 61 |
| 64 $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ | 62 $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ |
