Mercurial > hg > icedtea8-forest
changeset 2657:908e7985b339 jdk8u262-b03
8243059: Build fails when --with-vendor-name contains a comma
Summary: Avoid early evaluation of COMPANY_NAME
Reviewed-by: aph, andrew
| author | sgehwolf |
|---|---|
| date | Tue, 19 May 2020 03:05:59 +0100 |
| parents | 610bce6c43da |
| children | e1a42471eb39 |
| files | make/common/JavaCompilation.gmk |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/JavaCompilation.gmk Mon Dec 02 16:38:34 2019 -0800 +++ b/make/common/JavaCompilation.gmk Tue May 19 03:05:59 2020 +0100 @@ -222,7 +222,7 @@ $$($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))