From: Yann Collet <cyan@fb.com>
Date: Fri, 23 Oct 2020 02:53:01 +0000 (-0700)
Subject: fix partial-build test
X-Git-Tag: v1.4.7~46^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2370%2Fhead;p=thirdparty%2Fzstd.git

fix partial-build test

sometimes, the scope difference is solely determined by the list of source files,
not by the flags.
---

diff --git a/lib/Makefile b/lib/Makefile
index 1f10c7ab1..b8295ff03 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -185,7 +185,7 @@ HASH ?= md5sum
 
 HAVE_HASH := $(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
 ifeq ($(HAVE_HASH), 1)
-  HASH_VALUE := $(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | head -c 16)
+  HASH_VALUE := $(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | head -c 16)
   HASH_DIR := conf_$(HASH_VALUE)
 else
   $(info warning : could not find hash function to differentiate builds with different flags)
diff --git a/tests/libzstd_partial_builds.sh b/tests/libzstd_partial_builds.sh
index b1c1e3b1a..bee2dbda5 100755
--- a/tests/libzstd_partial_builds.sh
+++ b/tests/libzstd_partial_builds.sh
@@ -22,7 +22,6 @@ mustBeAbsent() {
 }
 
 # default compilation : all features enabled
-make clean > /dev/null
 $ECHO "testing default library compilation"
 CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID
 nm $DIR/../lib/libzstd.a | $GREP "\.o" > tmplog