makefiles/BuildLangtools.gmk

*** 110,136 ****
                  BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
  
          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
                  SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
                  JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
!                 JARMAIN:=com.sun.tools.javac.Main))
! 
!         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
!                 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
!                 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
!                 JARMAIN:=com.sun.tools.javah.Main))
! 
!         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
!                 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
!                 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
!                 JARMAIN:=com.sun.tools.javap.Main))
! 
!         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
!                 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
!                 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
!                 SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
!                 JARMAIN:=com.sun.tools.javadoc.Main))
  
          # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
          # yet built. It is currently not needed but might be again in the future. The following
          # exercises the functionality to verify that it works.
          TOOL_GENSTUBS_CMD=$(JAVA) \
--- 110,120 ----
                  BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
  
          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
                  SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
                  JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
!                 SUFFIXES:=.class $(RESOURCE_SUFFIXES)))
  
          # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
          # yet built. It is currently not needed but might be again in the future. The following
          # exercises the functionality to verify that it works.
          TOOL_GENSTUBS_CMD=$(JAVA) \
*** 174,184 ****
                  # that generates code for the new jdk that is being built.
                  # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
                  $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
                    JVM:=$(JAVA),\
                    JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
!                          -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
                    FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
                    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
                    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
                  $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
--- 158,169 ----
                  # that generates code for the new jdk that is being built.
                  # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
                  $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
                    JVM:=$(JAVA),\
                    JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
!                          -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
!                          com.sun.tools.javac.Main,\
                    FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
                    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
                    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
                  $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
*** 199,211 ****
                          SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
                          ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
  
                  all:            $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
                                  $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
!                                 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
!                                 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
!                                 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
!                                 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
! 
  
          endif
  endif
--- 184,192 ----
                          SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
                          ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
  
                  all:            $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
                                  $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
!                                 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
  
          endif
  endif