Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/makefiles/BuildCorba.gmk	Thu Jan 31 17:04:24 2013 -0800
     1.2 +++ b/makefiles/BuildCorba.gmk	Tue Feb 05 18:54:11 2013 -0800
     1.3 @@ -35,8 +35,6 @@
     1.4  include JavaCompilation.gmk
     1.5  include IdlCompilation.gmk
     1.6  
     1.7 -JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
     1.8 -		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
     1.9  # The Corba sources are old and generates a LOT of warnings.
    1.10  # Disable these using Xlint, until someone cares to fix them. 
    1.11  DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
    1.12 @@ -46,7 +44,7 @@
    1.13  # Thus we force the target bytecode to the boot jdk bytecode.
    1.14  $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
    1.15       JVM:=$(JAVA),\
    1.16 -     JAVAC:=$(JAVAC_JARS),\
    1.17 +     JAVAC:=$(NEW_JAVAC),\
    1.18       FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
    1.19       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.20       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.21 @@ -56,7 +54,7 @@
    1.22  # cannot necessarily be run with the boot jdk.
    1.23  $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
    1.24       JVM:=$(JAVA),\
    1.25 -     JAVAC:=$(JAVAC_JARS),\
    1.26 +     JAVAC:=$(NEW_JAVAC),\
    1.27       FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\
    1.28       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.29       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))