8243059: Build fails when --with-vendor-name contains a comma

Summary: Avoid early evaluation of COMPANY_NAME Reviewed-by: aph, andrew

8243059: Build fails when --with-vendor-name contains a comma
Summary: Avoid early evaluation of COMPANY_NAME Reviewed-by: aph, andrew
e8ab9adb · sgehwolf · a4d8d90c · e8ab9adb
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

make/common/JavaCompilation.gmk make/common/JavaCompilation.gmk +1 -1

未找到文件。
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -222,7 +222,7 @@ define SetupArchive
 	$$($1_GREP_EXCLUDE_OUTPUT)
 	$$(if $$($1_MANIFEST), \
 	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
+	      -e "s#@@COMPANY_NAME@@#$$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
 	, \
 	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
 	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))