Tue, 19 May 2020 03:05:59 +0100
8243059: Build fails when --with-vendor-name contains a comma
Summary: Avoid early evaluation of COMPANY_NAME
Reviewed-by: aph, andrew
make/common/JavaCompilation.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/make/common/JavaCompilation.gmk Mon Dec 02 16:38:34 2019 -0800 1.2 +++ b/make/common/JavaCompilation.gmk Tue May 19 03:05:59 2020 +0100 1.3 @@ -222,7 +222,7 @@ 1.4 $$($1_GREP_EXCLUDE_OUTPUT) 1.5 $$(if $$($1_MANIFEST), \ 1.6 $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ 1.7 - -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ 1.8 + -e "s#@@COMPANY_NAME@@#$$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ 1.9 , \ 1.10 $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)) 1.11 $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))