Mercurial > hg > openjdk > aarch64-port
changeset 529:6b96b7744913
8004045: build-infra: Error 12 from zip when updating src.zip
Summary: Hiding this error from make so that it doesn't fail
Reviewed-by: ohrstrom, dholmes
author | erikj |
---|---|
date | Fri, 07 Dec 2012 17:23:42 +0100 |
parents | 9a6ec97ec45c |
children | 2795874efd16 |
files | common/makefiles/JavaCompilation.gmk |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/makefiles/JavaCompilation.gmk Wed Dec 05 12:52:47 2012 -0800 +++ b/common/makefiles/JavaCompilation.gmk Fri Dec 07 17:23:42 2012 +0100 @@ -275,10 +275,12 @@ # Explicitly excluded files can be given with absolute path. The patsubst solution # isn't perfect but the likelyhood of an absolute path to match something in a src # dir is very small. + # If zip has nothing to do, it returns 12 and would fail the build. Check for 12 + # and only fail if it's not. $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) $(MKDIR) -p $$(@D) $(ECHO) Updating $$($1_NAME) - $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true + $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true $(TOUCH) $$@ endef