From: Yann Collet <yann.collet.73@gmail.com>
Date: Fri, 23 Oct 2020 17:27:12 +0000 (-0700)
Subject: fix partial lib test
X-Git-Tag: v1.4.7~41^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe8d9e428a2f24a1ccaf9ec6032db4930cb8b21;p=thirdparty%2Fzstd.git

fix partial lib test
---

diff --git a/lib/Makefile b/lib/Makefile
index fc9d6a6ce..bc45f9b0d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -226,7 +226,7 @@ ifeq ($(BUILD_DIR),0)
 .PHONY: libzstd.a  # not the actual recipe
 libzstd.a:
 	$(MAKE) --no-print-directory $@ \
-        BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | head -c 16) \
+        BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | head -c 16) \
         CPPFLAGS="$(CPPFLAGS)"
 
 else
@@ -266,7 +266,7 @@ ifeq ($(BUILD_DIR),0)
 .PHONY: $(LIBZSTD)  # not the actual recipe
 $(LIBZSTD):
 	$(MAKE) --no-print-directory $@ \
-        BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | head -c 16) \
+        BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | head -c 16) \
         CPPFLAGS="$(CPPFLAGS)" \
         CFLAGS="$(CFLAGS)" \
         LDFLAGS="$(LDFLAGS)"
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