From ae5974121d0acaa7ad103041ec3a965a26d495f8 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 4 Mar 2022 16:07:21 +0100 Subject: [PATCH 1/2] Fewer warnings in 'make clean' in clean directory --- Make.inc | 4 ++-- base/Makefile | 6 +++--- deps/curl.mk | 2 +- deps/dsfmt.mk | 6 +++--- deps/gmp.mk | 2 +- deps/libgit2.mk | 4 ++-- deps/libssh2.mk | 2 +- deps/libsuitesparse.mk | 6 +++--- deps/libwhich.mk | 2 +- deps/llvm.mk | 2 +- deps/mbedtls.mk | 2 +- deps/mpfr.mk | 2 +- deps/nghttp2.mk | 2 +- deps/objconv.mk | 4 ++-- deps/openblas.mk | 4 ++-- deps/openlibm.mk | 2 +- deps/p7zip.mk | 4 ++-- deps/patchelf.mk | 2 +- deps/pcre.mk | 4 ++-- deps/tools/bb-install.mk | 2 +- deps/tools/common.mk | 8 ++++---- deps/tools/git-external.mk | 2 +- deps/tools/stdlib-external.mk | 2 +- deps/unwind.mk | 6 +++--- deps/utf8proc.mk | 2 +- deps/zlib.mk | 2 +- src/Makefile | 2 +- 27 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Make.inc b/Make.inc index 1be3cb7ad80d7..e38e9ab16b519 100644 --- a/Make.inc +++ b/Make.inc @@ -1396,7 +1396,7 @@ clean-$$(abspath $(2)/$(3)): ifeq ($(BUILD_OS), WINNT) -cmd //C rmdir $$(call mingw_to_dos,$(2)/$(3),cd $(2) &&) else - -rm -r $$(abspath $(2)/$(3)) + -rm -rf $$(abspath $(2)/$(3)) endif $$(abspath $(2)/$(3)): | $$(abspath $(2)) ifeq ($$(BUILD_OS), WINNT) @@ -1404,7 +1404,7 @@ ifeq ($$(BUILD_OS), WINNT) else ifneq (,$$(findstring CYGWIN,$$(BUILD_OS))) @cmd /C mklink /J $$(call cygpath_w,$(2)/$(3)) $$(call cygpath_w,$(1)) else ifdef JULIA_VAGRANT_BUILD - @rm -r $$@ + @rm -rf $$@ @cp -R $$(abspath $(1)) $$@.tmp @mv $$@.tmp $$@ else diff --git a/base/Makefile b/base/Makefile index b7a78c453a35b..5c12ab1c149d8 100644 --- a/base/Makefile +++ b/base/Makefile @@ -169,7 +169,7 @@ $$(build_private_libdir)/$$(libname_$2): REALPATH=$$(libpath_$2); \ $$(call resolve_path,REALPATH) && \ [ -e "$$$$REALPATH" ] && \ - ([ ! -e "$$@" ] || rm "$$@") && \ + rm -f "$$@" && \ echo ln -sf "$$$$REALPATH" "$$@" && \ ln -sf "$$$$REALPATH" "$$@"; \ else \ @@ -193,7 +193,7 @@ endif $(build_bindir)/7z$(EXE): [ -e "$(7Z_PATH)" ] && \ - ([ ! -e "$@" ] || rm "$@") && \ + rm -f "$@" && \ ln -svf "$(7Z_PATH)" "$@" # the following excludes: libuv.a, libutf8proc.a @@ -258,7 +258,7 @@ $(build_private_libdir)/libLLVM.$(SHLIB_EXT): REALPATH=$(LLVM_CONFIG_HOST_LIBS) && \ $(call resolve_path,REALPATH) && \ [ -e "$$REALPATH" ] && \ - ([ ! -e "$@" ] || rm "$@") && \ + rm -f "$@" && \ echo ln -sf "$$REALPATH" "$@" && \ ln -sf "$$REALPATH" "$@" ifneq ($(USE_SYSTEM_LLVM),0) diff --git a/deps/curl.mk b/deps/curl.mk index f2cf21d19a354..1a4a12bc62200 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -75,7 +75,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libcurl.$$(SHLIB_EXT) $$(build_shlibdir)/libcurl.$$(SHLIB_EXT))) clean-curl: - -rm $(BUILDDIR)/curl-$(CURL_VER)/build-configured $(BUILDDIR)/curl-$(CURL_VER)/build-compiled + -rm -f $(BUILDDIR)/curl-$(CURL_VER)/build-configured $(BUILDDIR)/curl-$(CURL_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/curl-$(CURL_VER) clean distclean-curl: diff --git a/deps/dsfmt.mk b/deps/dsfmt.mk index e22f1b51fe8f7..1198d00432447 100644 --- a/deps/dsfmt.mk +++ b/deps/dsfmt.mk @@ -15,7 +15,7 @@ $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz: | $(SRCCACHE) $(BUILDDIR)/dsfmt-$(DSFMT_VER)/source-extracted: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz $(JLCHECKSUM) $< - -rm -r $(dir $@) + -rm -rf $(dir $@) mkdir -p $(dir $@) $(TAR) -C $(dir $@) --strip-components 1 -xf $< echo 1 > $@ @@ -47,8 +47,8 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libdSFMT.$$(SHLIB_EXT) $$(build_shlibdir)/libdSFMT.$$(SHLIB_EXT))) clean-dsfmt: - -rm $(BUILDDIR)/dsfmt-$(DSFMT_VER)/build-compiled - -rm $(BUILDDIR)/dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT) + -rm -f $(BUILDDIR)/dsfmt-$(DSFMT_VER)/build-compiled + -rm -f $(BUILDDIR)/dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT) distclean-dsfmt: -rm -rf $(SRCCACHE)/dsfmt*.tar.gz $(SRCCACHE)/dsfmt-$(DSFMT_VER) $(BUILDDIR)/dsfmt-$(DSFMT_VER) diff --git a/deps/gmp.mk b/deps/gmp.mk index a37327d82101e..715ee6b6d50b1 100644 --- a/deps/gmp.mk +++ b/deps/gmp.mk @@ -72,7 +72,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libgmp.$$(SHLIB_EXT) $$(build_shlibdir)/libgmp.$$(SHLIB_EXT))) clean-gmp: - -rm $(BUILDDIR)/gmp-$(GMP_VER)/build-configured $(BUILDDIR)/gmp-$(GMP_VER)/build-compiled + -rm -f $(BUILDDIR)/gmp-$(GMP_VER)/build-configured $(BUILDDIR)/gmp-$(GMP_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/gmp-$(GMP_VER) clean distclean-gmp: diff --git a/deps/libgit2.mk b/deps/libgit2.mk index 5902cc68960ae..991703da0ea28 100644 --- a/deps/libgit2.mk +++ b/deps/libgit2.mk @@ -80,8 +80,8 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libgit2.$$(SHLIB_EXT) $$(build_shlibdir)/libgit2.$$(SHLIB_EXT))) clean-libgit2: - -rm $(build_datarootdir)/julia/cert.pem - -rm $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-compiled + -rm -f $(build_datarootdir)/julia/cert.pem + -rm -f $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(LIBGIT2_SRC_DIR) clean get-libgit2: $(LIBGIT2_SRC_FILE) diff --git a/deps/libssh2.mk b/deps/libssh2.mk index e852d59fa996d..e27a57a4078d1 100644 --- a/deps/libssh2.mk +++ b/deps/libssh2.mk @@ -61,7 +61,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libssh2.$$(SHLIB_EXT) $$(build_shlibdir)/libssh2.$$(SHLIB_EXT))) clean-libssh2: - -rm $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-compiled + -rm -f $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(LIBSSH2_SRC_DIR) clean diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index 42ae7807bb4ec..11253cd1b09be 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -80,7 +80,7 @@ $(build_prefix)/manifest/libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARS echo $(UNINSTALL_libsuitesparse) > $@ clean-libsuitesparse: uninstall-libsuitesparse - -rm $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled + -rm -f $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled -rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/lib -rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/include -$(MAKE) -C $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) clean @@ -107,6 +107,6 @@ endif define manual_libsuitesparse uninstall-libsuitesparse: - -rm $(build_prefix)/manifest/libsuitesparse - -rm $(addprefix $(build_shlibdir)/lib,$3) + -rm -f $(build_prefix)/manifest/libsuitesparse + -rm -f $(addprefix $(build_shlibdir)/lib,$3) endef diff --git a/deps/libwhich.mk b/deps/libwhich.mk index aae5dead6f9f4..79017838193d2 100644 --- a/deps/libwhich.mk +++ b/deps/libwhich.mk @@ -25,7 +25,7 @@ $(eval $(call staged-install, \ LIBWHICH_INSTALL,,,)) clean-libwhich: - -rm $(BUILDDIR)/$(LIBWHICH_SRC_DIR)/build-compiled + -rm -f $(BUILDDIR)/$(LIBWHICH_SRC_DIR)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(LIBWHICH_SRC_DIR) clean get-libwhich: $(LIBWHICH_SRC_FILE) diff --git a/deps/llvm.mk b/deps/llvm.mk index 5afef0b83ba3c..dbce7b23c4255 100644 --- a/deps/llvm.mk +++ b/deps/llvm.mk @@ -281,7 +281,7 @@ $(eval $(call staged-install, \ LLVM_INSTALL,,,)) clean-llvm: - -rm $(LLVM_BUILDDIR_withtype)/build-configured $(LLVM_BUILDDIR_withtype)/build-compiled + -rm -f $(LLVM_BUILDDIR_withtype)/build-configured $(LLVM_BUILDDIR_withtype)/build-compiled -$(MAKE) -C $(LLVM_BUILDDIR_withtype) clean get-llvm: $(LLVM_SRC_FILE) diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk index 07d830441a090..97f6c1c252a84 100644 --- a/deps/mbedtls.mk +++ b/deps/mbedtls.mk @@ -71,7 +71,7 @@ $(eval $(call staged-install, \ clean-mbedtls: - -rm $(BUILDDIR)/$(MBEDTLS_SRC)/build-configured \ + -rm -f $(BUILDDIR)/$(MBEDTLS_SRC)/build-configured \ $(BUILDDIR)/$(MBEDTLS_SRC)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(MBEDTLS_SRC) clean diff --git a/deps/mpfr.mk b/deps/mpfr.mk index f908604ad8f36..e92da3dc63958 100644 --- a/deps/mpfr.mk +++ b/deps/mpfr.mk @@ -60,7 +60,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libmpfr.$$(SHLIB_EXT) $$(build_shlibdir)/libmpfr.$$(SHLIB_EXT))) clean-mpfr: - -rm $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured $(BUILDDIR)/mpfr-$(MPFR_VER)/build-compiled + -rm -f $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured $(BUILDDIR)/mpfr-$(MPFR_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/mpfr-$(MPFR_VER) clean distclean-mpfr: diff --git a/deps/nghttp2.mk b/deps/nghttp2.mk index 2b8a18728b712..275a7f9bfe887 100644 --- a/deps/nghttp2.mk +++ b/deps/nghttp2.mk @@ -36,7 +36,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libnghttp2.$$(SHLIB_EXT) $$(build_shlibdir)/libnghttp2.$$(SHLIB_EXT))) clean-nghttp2: - -rm $(BUILDDIR)/nghttp2-$(NGHTTP2_VER)/build-configured $(BUILDDIR)/nghttp2-$(NGHTTP2_VER)/build-compiled + -rm -f $(BUILDDIR)/nghttp2-$(NGHTTP2_VER)/build-configured $(BUILDDIR)/nghttp2-$(NGHTTP2_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/nghttp2-$(NGHTTP2_VER) clean distclean-nghttp2: diff --git a/deps/objconv.mk b/deps/objconv.mk index 7514004457ac7..e7886150dbd9d 100644 --- a/deps/objconv.mk +++ b/deps/objconv.mk @@ -6,7 +6,7 @@ $(SRCCACHE)/objconv.zip: | $(SRCCACHE) $(JLDOWNLOAD) $@ https://www.agner.org/optimize/objconv.zip $(BUILDDIR)/objconv/source-extracted: $(SRCCACHE)/objconv.zip - -rm -r $(dir $@) + -rm -rf $(dir $@) mkdir -p $(BUILDDIR) unzip -d $(dir $@) $< cd $(dir $@) && unzip source.zip @@ -21,7 +21,7 @@ $(eval $(call staged-install, \ BINFILE_INSTALL,$$(BUILDDIR)/objconv/objconv,,)) clean-objconv: - -rm $(BUILDDIR)/objconv/build-compiled $(build_depsbindir)/objconv + -rm -f $(BUILDDIR)/objconv/build-compiled $(build_depsbindir)/objconv distclean-objconv: -rm -rf $(SRCCACHE)/objconv.zip $(BUILDDIR)/objconv diff --git a/deps/openblas.mk b/deps/openblas.mk index d4ee63a543bf0..b68f1fa3592bd 100644 --- a/deps/openblas.mk +++ b/deps/openblas.mk @@ -115,7 +115,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libopenblas$$(OPENBLAS_LIBNAMESUFFIX).$$(SHLIB_EXT) $$(build_shlibdir)/libopenblas$$(OPENBLAS_LIBNAMESUFFIX).$$(SHLIB_EXT))) clean-openblas: - -rm $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled + -rm -f $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(OPENBLAS_SRC_DIR) clean @@ -186,7 +186,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)liblapack.$$(SHLIB_EXT) $$(build_shlibdir)/liblapack.$$(SHLIB_EXT))) clean-lapack: - -rm $(BUILDDIR)/lapack-$(LAPACK_VER)/build-compiled0 $(BUILDDIR)/lapack-$(LAPACK_VER)/build-compiled + -rm -f $(BUILDDIR)/lapack-$(LAPACK_VER)/build-compiled0 $(BUILDDIR)/lapack-$(LAPACK_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/lapack-$(LAPACK_VER) clean distclean-lapack: diff --git a/deps/openlibm.mk b/deps/openlibm.mk index 544519e12f0d0..f99cdade47b91 100644 --- a/deps/openlibm.mk +++ b/deps/openlibm.mk @@ -16,7 +16,7 @@ $(eval $(call staged-install, \ $(INSTALL_NAME_CMD)libopenlibm.$(SHLIB_EXT) $(build_shlibdir)/libopenlibm.$(SHLIB_EXT))) clean-openlibm: - -rm $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled $(build_libdir)/libopenlibm.a + -rm -f $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled $(build_libdir)/libopenlibm.a -$(MAKE) -C $(BUILDDIR)/$(OPENLIBM_SRC_DIR) distclean $(OPENLIBM_FLAGS) diff --git a/deps/p7zip.mk b/deps/p7zip.mk index 20c85602f767a..c0cd88f642188 100644 --- a/deps/p7zip.mk +++ b/deps/p7zip.mk @@ -44,8 +44,8 @@ $(eval $(call staged-install, \ P7ZIP_INSTALL,,,)) clean-p7zip: - -rm $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled - -rm $(build_bindir)/7za + -rm -f $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled + -rm -f $(build_bindir)/7za -$(MAKE) -C $(BUILDDIR)/p7zip-$(P7ZIP_VER) clean distclean-p7zip: diff --git a/deps/patchelf.mk b/deps/patchelf.mk index e3a8c6fb9bf1a..c5b4408d95a82 100644 --- a/deps/patchelf.mk +++ b/deps/patchelf.mk @@ -38,7 +38,7 @@ $(eval $(call staged-install, \ MAKE_INSTALL,$$(LIBTOOL_CCLD),,)) clean-patchelf: - -rm $(BUILDDIR)/patchelf-$(PATCHELF_VER)/build-configured \ + -rm -f $(BUILDDIR)/patchelf-$(PATCHELF_VER)/build-configured \ $(BUILDDIR)/patchelf-$(PATCHELF_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/patchelf-$(PATCHELF_VER) clean diff --git a/deps/pcre.mk b/deps/pcre.mk index 053a773e5609e..916946fe3ad08 100644 --- a/deps/pcre.mk +++ b/deps/pcre.mk @@ -46,11 +46,11 @@ endif $(eval $(call staged-install, \ pcre,pcre2-$$(PCRE_VER), \ MAKE_INSTALL,$$(LIBTOOL_CCLD),, \ - rm $$(build_shlibdir)/libpcre2-posix.* && \ + rm -f $$(build_shlibdir)/libpcre2-posix.* && \ $$(INSTALL_NAME_CMD)libpcre2-8.$$(SHLIB_EXT) $$(build_shlibdir)/libpcre2-8.$$(SHLIB_EXT))) clean-pcre: - -rm $(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured $(BUILDDIR)/pcre2-$(PCRE_VER)/build-compiled + -rm -f $(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured $(BUILDDIR)/pcre2-$(PCRE_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/pcre2-$(PCRE_VER) clean distclean-pcre: diff --git a/deps/tools/bb-install.mk b/deps/tools/bb-install.mk index 781d66f1c5dda..3b6ef327f944f 100644 --- a/deps/tools/bb-install.mk +++ b/deps/tools/bb-install.mk @@ -79,5 +79,5 @@ endef define bb-uninstaller uninstall-$(strip $1): -cd $$(build_prefix) && rm -fv -- $$$$($$(TAR) -tzf $$(SRCCACHE)/$2.tar.gz | grep -v '/$$$$') - -rm $$(build_prefix)/manifest/$(strip $1) + -rm -f $$(build_prefix)/manifest/$(strip $1) endef diff --git a/deps/tools/common.mk b/deps/tools/common.mk index 642528376d457..4e1e52ddd7acd 100644 --- a/deps/tools/common.mk +++ b/deps/tools/common.mk @@ -156,7 +156,7 @@ endif reinstall-$(strip $1): +$$(MAKE) uninstall-$(strip $1) - -rm $$(build_staging)/$2.tgz + -rm -f $$(build_staging)/$2.tgz +$$(MAKE) stage-$(strip $1) +$$(MAKE) install-$(strip $1) @@ -180,7 +180,7 @@ endef define staged-uninstaller uninstall-$(strip $1): -cd $$(build_prefix) && rm -fv -- $$$$($$(TAR) -tzf $$(build_staging)/$2.tgz | grep -v '/$$$$') - -rm $$(build_prefix)/manifest/$(strip $1) + -rm -f $$(build_prefix)/manifest/$(strip $1) endef @@ -216,9 +216,9 @@ uninstall-$1: ifeq ($$(BUILD_OS), WINNT) -cmd //C rmdir $$(call mingw_to_dos,$3/$1,cd $3 &&) else - -rm -r $3/$1 + -rm -rf $3/$1 endif - -rm $$(build_prefix)/manifest/$1 + -rm -f $$(build_prefix)/manifest/$1 endef diff --git a/deps/tools/git-external.mk b/deps/tools/git-external.mk index 5dc1259a0f378..e7cf650471dc9 100644 --- a/deps/tools/git-external.mk +++ b/deps/tools/git-external.mk @@ -63,7 +63,7 @@ $$($2_SRC_FILE): | $$(SRCCACHE) $$(JLDOWNLOAD) $$@ $$(call $2_TAR_URL,$$($2_SHA1)) $5/$$($2_SRC_DIR)/source-extracted: $$($2_SRC_FILE) $$(JLCHECKSUM) $$< - -[ ! \( -e $$(dir $$@) -o -h $$(dir $$@) \) ] || rm -r $$(dir $$@) + -[ ! \( -e $$(dir $$@) -o -h $$(dir $$@) \) ] || rm -rf $$(dir $$@) mkdir -p $$(dir $$@) $(TAR) -C $$(dir $$@) --strip-components 1 -xf $$< echo 1 > $$@ diff --git a/deps/tools/stdlib-external.mk b/deps/tools/stdlib-external.mk index 043a53341193a..60f50b56ee2e0 100644 --- a/deps/tools/stdlib-external.mk +++ b/deps/tools/stdlib-external.mk @@ -18,7 +18,7 @@ $$(BUILDDIR)/$$($2_SRC_DIR)/build-compiled: $$(BUILDDIR)/$$($2_SRC_DIR)/source-e echo 1 > $$@ $$(eval $$(call symlink_install,$1,$$$$($2_SRC_DIR),$$$$(build_datarootdir)/julia/stdlib/$$$$(VERSDIR))) clean-$1: - -rm $$(BUILDDIR)/$$($2_SRC_DIR)/build-compiled + -rm -f $$(BUILDDIR)/$$($2_SRC_DIR)/build-compiled get-$1: $$($2_SRC_FILE) extract-$1: $$(BUILDDIR)/$$($2_SRC_DIR)/source-extracted configure-$1: extract-$1 diff --git a/deps/unwind.mk b/deps/unwind.mk index c794b94d5e636..ee2992fe42c79 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -57,7 +57,7 @@ $(eval $(call staged-install, \ MAKE_INSTALL,,,)) clean-unwind: - -rm $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-compiled + -rm -f $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-compiled -$(MAKE) -C $(BUILDDIR)/libunwind-$(UNWIND_VER) clean distclean-unwind: @@ -114,8 +114,8 @@ $(eval $(call staged-install, \ cp -fR $(SRCCACHE)/llvmunwind-$(LLVMUNWIND_VER)/include/* $(build_includedir))) clean-llvmunwind: - -rm $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-compiled - -rm -r $(build_includedir)/mach-o/ $(build_includedir)/unwind.h $(build_includedir)/libunwind.h + -rm -f $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-compiled + -rm -rf $(build_includedir)/mach-o/ $(build_includedir)/unwind.h $(build_includedir)/libunwind.h -$(MAKE) -C $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER) clean distclean-llvmunwind: diff --git a/deps/utf8proc.mk b/deps/utf8proc.mk index 52775a2dff5e6..70cf4e396ff65 100644 --- a/deps/utf8proc.mk +++ b/deps/utf8proc.mk @@ -29,7 +29,7 @@ $(eval $(call staged-install, \ UTF8PROC_INSTALL,,,)) clean-utf8proc: - -rm $(BUILDDIR)/$(UTF8PROC_SRC_DIR)/build-compiled + -rm -f $(BUILDDIR)/$(UTF8PROC_SRC_DIR)/build-compiled -$(MAKE) -C $(BUILDDIR)/$(UTF8PROC_SRC_DIR) clean get-utf8proc: $(UTF8PROC_SRC_FILE) diff --git a/deps/zlib.mk b/deps/zlib.mk index b31ab425ccfc3..d43f829c13111 100644 --- a/deps/zlib.mk +++ b/deps/zlib.mk @@ -19,7 +19,7 @@ $(eval $(call staged-install, \ $(INSTALL_NAME_CMD)libz.$(SHLIB_EXT) $(build_shlibdir)/libz.$(SHLIB_EXT))) clean-zlib: - -rm $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-compiled $(build_libdir)/libz.a* $(build_libdir)/libz.so* $(build_includedir)/zlib.h $(build_includedir)/zconf.h + -rm -f $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-compiled $(build_libdir)/libz.a* $(build_libdir)/libz.so* $(build_includedir)/zlib.h $(build_includedir)/zconf.h -$(MAKE) -C $(BUILDDIR)/$(ZLIB_SRC_DIR) distclean $(ZLIB_FLAGS) get-zlib: $(ZLIB_SRC_FILE) diff --git a/src/Makefile b/src/Makefile index a4fcf67612e0e..a6a88d5fb680d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -259,7 +259,7 @@ endif @## clang should have made the dSYM split-debug directory, @## but we are intentionally not going to give it the correct name @## because we want to test the non-default debug configuration - @#rm -r $@.dSYM && mv $@.tmp.dSYM $@.dSYM + @#rm -rf $@.dSYM && mv $@.tmp.dSYM $@.dSYM mv $@.tmp $@ $(INSTALL_NAME_CMD)libccalltest.$(SHLIB_EXT) $@ From 74d207cf01e7ed6fac7592cf8a16ef287def2c85 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 15 Mar 2022 10:07:43 +0100 Subject: [PATCH 2/2] Don't ignore exit code for 'rm -rf' --- Make.inc | 2 +- contrib/mac/frameworkapp/Makefile | 4 ++-- deps/curl.mk | 2 +- deps/dsfmt.mk | 4 ++-- deps/gmp.mk | 2 +- deps/libsuitesparse.mk | 2 +- deps/libuv.mk | 2 +- deps/mbedtls.mk | 2 +- deps/mpfr.mk | 2 +- deps/nghttp2.mk | 2 +- deps/objconv.mk | 4 ++-- deps/openblas.mk | 2 +- deps/p7zip.mk | 2 +- deps/patchelf.mk | 2 +- deps/pcre.mk | 2 +- deps/tools/common.mk | 2 +- deps/tools/git-external.mk | 2 +- deps/unwind.mk | 6 +++--- doc/Makefile | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Make.inc b/Make.inc index e38e9ab16b519..52d00f92e61dd 100644 --- a/Make.inc +++ b/Make.inc @@ -1396,7 +1396,7 @@ clean-$$(abspath $(2)/$(3)): ifeq ($(BUILD_OS), WINNT) -cmd //C rmdir $$(call mingw_to_dos,$(2)/$(3),cd $(2) &&) else - -rm -rf $$(abspath $(2)/$(3)) + rm -rf $$(abspath $(2)/$(3)) endif $$(abspath $(2)/$(3)): | $$(abspath $(2)) ifeq ($$(BUILD_OS), WINNT) diff --git a/contrib/mac/frameworkapp/Makefile b/contrib/mac/frameworkapp/Makefile index fbca4577df1bc..c94a5be145db9 100644 --- a/contrib/mac/frameworkapp/Makefile +++ b/contrib/mac/frameworkapp/Makefile @@ -116,8 +116,8 @@ signedproductarchive: $(PRODUCTARCHIVE) mv $<.signed $< clean: - -rm -rf $(XCARCHIVE) $(XCDERIVEDDATA) $(XCEXPORT) - -rm -rf $(FRAMEWORK_DESTDIR) + rm -rf $(XCARCHIVE) $(XCDERIVEDDATA) $(XCEXPORT) + rm -rf $(FRAMEWORK_DESTDIR) -rm -f $(PRODUCTARCHIVE) .PHONY: appexport clean productarchive signedproductarchive diff --git a/deps/curl.mk b/deps/curl.mk index 1a4a12bc62200..12b331c57606f 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -79,7 +79,7 @@ clean-curl: -$(MAKE) -C $(BUILDDIR)/curl-$(CURL_VER) clean distclean-curl: - -rm -rf $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(SRCCACHE)/curl-$(CURL_VER) $(BUILDDIR)/curl-$(CURL_VER) + rm -rf $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(SRCCACHE)/curl-$(CURL_VER) $(BUILDDIR)/curl-$(CURL_VER) get-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 extract-curl: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted diff --git a/deps/dsfmt.mk b/deps/dsfmt.mk index 1198d00432447..2300d0d5929f4 100644 --- a/deps/dsfmt.mk +++ b/deps/dsfmt.mk @@ -15,7 +15,7 @@ $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz: | $(SRCCACHE) $(BUILDDIR)/dsfmt-$(DSFMT_VER)/source-extracted: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz $(JLCHECKSUM) $< - -rm -rf $(dir $@) + rm -rf $(dir $@) mkdir -p $(dir $@) $(TAR) -C $(dir $@) --strip-components 1 -xf $< echo 1 > $@ @@ -51,7 +51,7 @@ clean-dsfmt: -rm -f $(BUILDDIR)/dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT) distclean-dsfmt: - -rm -rf $(SRCCACHE)/dsfmt*.tar.gz $(SRCCACHE)/dsfmt-$(DSFMT_VER) $(BUILDDIR)/dsfmt-$(DSFMT_VER) + rm -rf $(SRCCACHE)/dsfmt*.tar.gz $(SRCCACHE)/dsfmt-$(DSFMT_VER) $(BUILDDIR)/dsfmt-$(DSFMT_VER) get-dsfmt: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz extract-dsfmt: $(BUILDDIR)/dsfmt-$(DSFMT_VER)/source-extracted diff --git a/deps/gmp.mk b/deps/gmp.mk index 715ee6b6d50b1..b09b1bddf3c18 100644 --- a/deps/gmp.mk +++ b/deps/gmp.mk @@ -76,7 +76,7 @@ clean-gmp: -$(MAKE) -C $(BUILDDIR)/gmp-$(GMP_VER) clean distclean-gmp: - -rm -rf $(SRCCACHE)/gmp-$(GMP_VER).tar.bz2 \ + rm -rf $(SRCCACHE)/gmp-$(GMP_VER).tar.bz2 \ $(SRCCACHE)/gmp-$(GMP_VER) \ $(BUILDDIR)/gmp-$(GMP_VER) diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index 11253cd1b09be..1316a99a5b510 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -86,7 +86,7 @@ clean-libsuitesparse: uninstall-libsuitesparse -$(MAKE) -C $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) clean distclean-libsuitesparse: - -rm -rf $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz \ + rm -rf $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz \ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) get-libsuitesparse: $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz diff --git a/deps/libuv.mk b/deps/libuv.mk index a51cc5a9f6bb7..cdcd12d8db4fa 100644 --- a/deps/libuv.mk +++ b/deps/libuv.mk @@ -43,7 +43,7 @@ $(eval $(call staged-install, \ $$(INSTALL_NAME_CMD)libuv.$$(SHLIB_EXT) $$(build_shlibdir)/libuv.$$(SHLIB_EXT))) clean-libuv: - -rm -rf $(LIBUV_BUILDDIR)/build-configured $(LIBUV_BUILDDIR)/build-compiled + rm -rf $(LIBUV_BUILDDIR)/build-configured $(LIBUV_BUILDDIR)/build-compiled -$(MAKE) -C $(LIBUV_BUILDDIR) clean diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk index 97f6c1c252a84..5ddfd08327bb4 100644 --- a/deps/mbedtls.mk +++ b/deps/mbedtls.mk @@ -76,7 +76,7 @@ clean-mbedtls: -$(MAKE) -C $(BUILDDIR)/$(MBEDTLS_SRC) clean distclean-mbedtls: - -rm -rf $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz \ + rm -rf $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz \ $(SRCCACHE)/$(MBEDTLS_SRC) \ $(BUILDDIR)/$(MBEDTLS_SRC) diff --git a/deps/mpfr.mk b/deps/mpfr.mk index e92da3dc63958..4598a319df6d5 100644 --- a/deps/mpfr.mk +++ b/deps/mpfr.mk @@ -64,7 +64,7 @@ clean-mpfr: -$(MAKE) -C $(BUILDDIR)/mpfr-$(MPFR_VER) clean distclean-mpfr: - -rm -rf $(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2 \ + rm -rf $(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2 \ $(SRCCACHE)/mpfr-$(MPFR_VER) \ $(BUILDDIR)/mpfr-$(MPFR_VER) diff --git a/deps/nghttp2.mk b/deps/nghttp2.mk index 275a7f9bfe887..54fd6a241eaba 100644 --- a/deps/nghttp2.mk +++ b/deps/nghttp2.mk @@ -40,7 +40,7 @@ clean-nghttp2: -$(MAKE) -C $(BUILDDIR)/nghttp2-$(NGHTTP2_VER) clean distclean-nghttp2: - -rm -rf $(SRCCACHE)/nghttp2-$(NGHTTP2_VER).tar.bz2 \ + rm -rf $(SRCCACHE)/nghttp2-$(NGHTTP2_VER).tar.bz2 \ $(SRCCACHE)/nghttp2-$(NGHTTP2_VER) \ $(BUILDDIR)/nghttp2-$(NGHTTP2_VER) diff --git a/deps/objconv.mk b/deps/objconv.mk index e7886150dbd9d..8423e476d37c6 100644 --- a/deps/objconv.mk +++ b/deps/objconv.mk @@ -6,7 +6,7 @@ $(SRCCACHE)/objconv.zip: | $(SRCCACHE) $(JLDOWNLOAD) $@ https://www.agner.org/optimize/objconv.zip $(BUILDDIR)/objconv/source-extracted: $(SRCCACHE)/objconv.zip - -rm -rf $(dir $@) + rm -rf $(dir $@) mkdir -p $(BUILDDIR) unzip -d $(dir $@) $< cd $(dir $@) && unzip source.zip @@ -24,7 +24,7 @@ clean-objconv: -rm -f $(BUILDDIR)/objconv/build-compiled $(build_depsbindir)/objconv distclean-objconv: - -rm -rf $(SRCCACHE)/objconv.zip $(BUILDDIR)/objconv + rm -rf $(SRCCACHE)/objconv.zip $(BUILDDIR)/objconv get-objconv: $(SRCCACHE)/objconv.zip diff --git a/deps/openblas.mk b/deps/openblas.mk index b68f1fa3592bd..a025580bcc923 100644 --- a/deps/openblas.mk +++ b/deps/openblas.mk @@ -190,7 +190,7 @@ clean-lapack: -$(MAKE) -C $(BUILDDIR)/lapack-$(LAPACK_VER) clean distclean-lapack: - -rm -rf $(SRCCACHE)/lapack-$(LAPACK_VER).tgz $(BUILDDIR)/lapack-$(LAPACK_VER) + rm -rf $(SRCCACHE)/lapack-$(LAPACK_VER).tgz $(BUILDDIR)/lapack-$(LAPACK_VER) get-lapack: $(SRCCACHE)/lapack-$(LAPACK_VER).tgz diff --git a/deps/p7zip.mk b/deps/p7zip.mk index c0cd88f642188..fe3f5d6fa98d9 100644 --- a/deps/p7zip.mk +++ b/deps/p7zip.mk @@ -49,7 +49,7 @@ clean-p7zip: -$(MAKE) -C $(BUILDDIR)/p7zip-$(P7ZIP_VER) clean distclean-p7zip: - -rm -rf $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.bz2 $(SRCCACHE)/p7zip-$(P7ZIP_VER) $(BUILDDIR)/p7zip-$(P7ZIP_VER) + rm -rf $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.bz2 $(SRCCACHE)/p7zip-$(P7ZIP_VER) $(BUILDDIR)/p7zip-$(P7ZIP_VER) get-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.bz2 diff --git a/deps/patchelf.mk b/deps/patchelf.mk index c5b4408d95a82..4d1a281ed2331 100644 --- a/deps/patchelf.mk +++ b/deps/patchelf.mk @@ -43,7 +43,7 @@ clean-patchelf: -$(MAKE) -C $(BUILDDIR)/patchelf-$(PATCHELF_VER) clean distclean-patchelf: - -rm -rf $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2 \ + rm -rf $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2 \ $(SRCCACHE)/patchelf-$(PATCHELF_VER) \ $(BUILDDIR)/patchelf-$(PATCHELF_VER) diff --git a/deps/pcre.mk b/deps/pcre.mk index 916946fe3ad08..71b69b318f695 100644 --- a/deps/pcre.mk +++ b/deps/pcre.mk @@ -54,7 +54,7 @@ clean-pcre: -$(MAKE) -C $(BUILDDIR)/pcre2-$(PCRE_VER) clean distclean-pcre: - -rm -rf $(SRCCACHE)/pcre2-$(PCRE_VER).tar.bz2 $(SRCCACHE)/pcre2-$(PCRE_VER) $(BUILDDIR)/pcre2-$(PCRE_VER) + rm -rf $(SRCCACHE)/pcre2-$(PCRE_VER).tar.bz2 $(SRCCACHE)/pcre2-$(PCRE_VER) $(BUILDDIR)/pcre2-$(PCRE_VER) get-pcre: $(SRCCACHE)/pcre2-$(PCRE_VER).tar.bz2 diff --git a/deps/tools/common.mk b/deps/tools/common.mk index 4e1e52ddd7acd..006d3486fcc37 100644 --- a/deps/tools/common.mk +++ b/deps/tools/common.mk @@ -216,7 +216,7 @@ uninstall-$1: ifeq ($$(BUILD_OS), WINNT) -cmd //C rmdir $$(call mingw_to_dos,$3/$1,cd $3 &&) else - -rm -rf $3/$1 + rm -rf $3/$1 endif -rm -f $$(build_prefix)/manifest/$1 endef diff --git a/deps/tools/git-external.mk b/deps/tools/git-external.mk index e7cf650471dc9..65b40b87ee937 100644 --- a/deps/tools/git-external.mk +++ b/deps/tools/git-external.mk @@ -74,5 +74,5 @@ endif # DEPS_GIT $$(build_prefix)/manifest/$1: $$(SRCDIR)/$1.version # make the manifest stale if the version file is touched (causing re-install for compliant targets) distclean-$1: - -rm -rf $5/$$($2_SRC_DIR) $$($2_SRC_FILE) $$(BUILDDIR)/$$($2_SRC_DIR) + rm -rf $5/$$($2_SRC_DIR) $$($2_SRC_FILE) $$(BUILDDIR)/$$($2_SRC_DIR) endef diff --git a/deps/unwind.mk b/deps/unwind.mk index ee2992fe42c79..ad7a91f4dff4a 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -61,7 +61,7 @@ clean-unwind: -$(MAKE) -C $(BUILDDIR)/libunwind-$(UNWIND_VER) clean distclean-unwind: - -rm -rf $(SRCCACHE)/libunwind-$(UNWIND_VER).tar.gz \ + rm -rf $(SRCCACHE)/libunwind-$(UNWIND_VER).tar.gz \ $(SRCCACHE)/libunwind-$(UNWIND_VER) \ $(BUILDDIR)/libunwind-$(UNWIND_VER) @@ -115,11 +115,11 @@ $(eval $(call staged-install, \ clean-llvmunwind: -rm -f $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-compiled - -rm -rf $(build_includedir)/mach-o/ $(build_includedir)/unwind.h $(build_includedir)/libunwind.h + rm -rf $(build_includedir)/mach-o/ $(build_includedir)/unwind.h $(build_includedir)/libunwind.h -$(MAKE) -C $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER) clean distclean-llvmunwind: - -rm -rf $(SRCCACHE)/llvmunwind-$(LLVMUNWIND_VER).tar.xz \ + rm -rf $(SRCCACHE)/llvmunwind-$(LLVMUNWIND_VER).tar.xz \ $(SRCCACHE)/llvmunwind-$(LLVMUNWIND_VER) \ $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER) diff --git a/doc/Makefile b/doc/Makefile index 2f8b3f18495d8..246d5c3f4b513 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -38,7 +38,7 @@ checksum-unicodedata: $(SRCCACHE)/UnicodeData-$(UNICODE_DATA_VERSION).txt $(JLCHECKSUM) "$<" clean: - -rm -rf _build/* deps/* docbuild.log UnicodeData.txt + rm -rf _build/* deps/* docbuild.log UnicodeData.txt cleanall: clean