1.1 --- a/makefiles/BuildLangtools.gmk Wed Feb 13 17:04:21 2013 +0000 1.2 +++ b/makefiles/BuildLangtools.gmk Wed Feb 13 11:25:58 2013 -0800 1.3 @@ -112,23 +112,7 @@ 1.4 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 1.5 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 1.6 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ 1.7 - JARMAIN:=com.sun.tools.javac.Main)) 1.8 - 1.9 - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 1.10 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 1.11 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\ 1.12 - JARMAIN:=com.sun.tools.javah.Main)) 1.13 - 1.14 - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 1.15 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 1.16 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\ 1.17 - JARMAIN:=com.sun.tools.javap.Main)) 1.18 - 1.19 - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 1.20 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 1.21 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\ 1.22 - SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ 1.23 - JARMAIN:=com.sun.tools.javadoc.Main)) 1.24 + SUFFIXES:=.class $(RESOURCE_SUFFIXES))) 1.25 1.26 # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 1.27 # yet built. It is currently not needed but might be again in the future. The following 1.28 @@ -176,7 +160,8 @@ 1.29 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 1.30 JVM:=$(JAVA),\ 1.31 JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 1.32 - -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ 1.33 + -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.34 + com.sun.tools.javac.Main,\ 1.35 FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ 1.36 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.37 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 1.38 @@ -201,11 +186,7 @@ 1.39 1.40 all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ 1.41 $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ 1.42 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.43 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \ 1.44 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \ 1.45 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar 1.46 - 1.47 + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.48 1.49 endif 1.50 endif