6928960: make modules fails to build class analyzer

Reviewed-by: mchung

6928960: make modules fails to build class analyzer
Reviewed-by: mchung
b1917a91 · alanb · 9456a024 · b1917a91
隐藏空白更改
内联并排

Showing with 2 addition and 3 deletion

jdk/make/modules/tools/Makefile jdk/make/modules/tools/Makefile +2 -3

未找到文件。
--- a/jdk/make/modules/tools/Makefile
+++ b/jdk/make/modules/tools/Makefile
@@ -135,9 +135,8 @@ $(BUILDTOOLCLASSDIR)/%.class : $(BUILDTOOL_SOURCE_ROOT)/%.java
 $(CLASSANALYZER_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(FILES_class)
 	@$(prep-target)
-	$(CD) $(BUILDTOOLCLASSDIR) && \
+	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-	    $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
+	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) $(BOOT_JAR_JFLAGS) || $(RM) $@
-	       $(PKGDIR) $(BOOT_JAR_JFLAGS) || $(RM) $@
 	@$(java-vm-cleanup)
 $(BUILDTOOLJARDIR)/classfile.jar: $(FILES_classfile_class)