From e7647180cd8f2ae02e0ec9389ce21e38b803dd28 Mon Sep 17 00:00:00 2001 From: Niclas Rosenvik Date: Sun, 28 Mar 2021 14:36:13 +0200 Subject: [PATCH] Stop complaining about hash tool not found If build_dir is set the zstd build complains about md5sum not being found. Fix this by checking if build_dir is set before checking and using the hash tool just like in lib/Makefile . --- programs/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/Makefile b/programs/Makefile index 14b6d4667..7157c7a54 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -100,6 +100,8 @@ ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) ZSTD_ALL_OBJ := $(ZSTD_ALL_SRC:.c=.o) UNAME := $(shell uname) + +ifndef BUILD_DIR ifeq ($(UNAME), Darwin) HASH ?= md5 else ifeq ($(UNAME), FreeBSD) @@ -112,7 +114,6 @@ endif HASH ?= md5sum HAVE_HASH :=$(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0) -ifndef BUILD_DIR HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(ZSTD_FILES) | $(HASH) | cut -f 1 -d " ") ifeq ($(HAVE_HASH),0) $(info warning : could not find HASH ($(HASH)), needed to differentiate builds using different flags) -- 2.47.3