From e3867fb735842ce4165f027204a17a2e90e1f597 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 22 Oct 2020 11:28:46 -0700 Subject: [PATCH] fixed libzstd.dll compilation on mingw and zstd linking --- lib/Makefile | 8 ++++---- programs/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 8924bfb43..1f10c7ab1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -236,8 +236,8 @@ libzstd.a: $(ZSTD_STATLIB_DIR)/libzstd.a ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) LIBZSTD = dll\libzstd.dll -$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): | $(ZSTD_DYNLIB_DIR) -$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_FILES) +$(LIBZSTD): +$(LIBZSTD): $(ZSTD_FILES) @echo compiling dynamic library $(LIBVER) $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@ @@ -254,12 +254,12 @@ $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_DYNLIB_OBJ) $(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) $(Q)ln -sf $@ libzstd.$(SHARED_EXT) -endif - .PHONY: $(LIBZSTD) # must be run every time $(LIBZSTD): $(ZSTD_DYNLIB_DIR)/$(LIBZSTD) $(Q)ln -sf $< $@ +endif + .PHONY: libzstd libzstd : $(LIBZSTD) diff --git a/programs/Makefile b/programs/Makefile index 575931f8c..70fb2c32d 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -217,7 +217,7 @@ ifneq (,$(filter Windows%,$(OS))) zstd : $(RES_FILE) endif zstd : $(BUILD_DIR)/zstd - $(Q)ln -sf $^ $@ + $(Q)ln -sf $< $@ @echo zstd build completed .PHONY: zstd-release -- 2.47.2