Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/makefiles/Makefile	Thu Sep 06 17:27:24 2012 -0700
     1.2 +++ b/makefiles/Makefile	Tue Sep 18 11:29:51 2012 -0700
     1.3 @@ -48,10 +48,8 @@
     1.4       JVM:=$(JAVA),\
     1.5       JAVAC:=$(JAVAC_JARS),\
     1.6       FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
     1.7 -     SERVER_DIR:=$(JAVAC_SERVERS),\
     1.8 -     SERVER_JVM:=$(SERVER_JAVA),\
     1.9 -     MODE:=$(JAVAC_USE_MODE),\
    1.10 -     USE_DEPS:=$(JAVAC_USE_DEPS)))
    1.11 +     SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.12 +     SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.13  
    1.14  # The "generate new bytecode" uses the new compiler to generate bytecode
    1.15  # for the new jdk that is being built. The code compiled by this setup
    1.16 @@ -59,13 +57,9 @@
    1.17  $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
    1.18       JVM:=$(JAVA),\
    1.19       JAVAC:=$(JAVAC_JARS),\
    1.20 -     FLAGS:=-Xprefer:source -XDignore.symbol.file=true \
    1.21 -		-cp $(BOOT_JDK)/lib/tools.jar \
    1.22 -		$(DISABLE_CORBA_WARNINGS),\
    1.23 -     SERVER_DIR:=$(JAVAC_SERVERS),\
    1.24 -     SERVER_JVM:=$(SERVER_JAVA),\
    1.25 -     MODE:=$(JAVAC_USE_MODE),\
    1.26 -     USE_DEPS:=$(JAVAC_USE_DEPS)))
    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)))
    1.30  
    1.31  $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\
    1.32  		SETUP:=GENERATE_OLDBYTECODE,\