From d3f1a9b5bdc37dbad741c87cc58d65d1bb2effa8 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 22 Oct 2020 19:53:01 -0700 Subject: [PATCH] fix partial-build test sometimes, the scope difference is solely determined by the list of source files, not by the flags. --- lib/Makefile | 2 +- tests/libzstd_partial_builds.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 -- 2.47.2