From: Yann Collet Date: Thu, 22 Oct 2020 07:15:31 +0000 (-0700) Subject: fix directory creation for Windows' libzstd X-Git-Tag: v1.4.7~46^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=494f7169ed7431280cb6c44decf7c73783a51dba;p=thirdparty%2Fzstd.git fix directory creation for Windows' libzstd --- diff --git a/lib/Makefile b/lib/Makefile index 97ce0e67e..8924bfb43 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -224,6 +224,7 @@ lib-all: all all: lib $(ZSTD_STATLIB_DIR)/libzstd.a: ARFLAGS = rcs +$(ZSTD_STATLIB_DIR)/libzstd.a: | $(ZSTD_STATLIB_DIR) $(ZSTD_STATLIB_DIR)/libzstd.a: $(ZSTD_STATLIB_OBJ) @echo compiling static library $(Q)$(AR) $(ARFLAGS) $@ $^ @@ -235,6 +236,7 @@ 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) @echo compiling dynamic library $(LIBVER) $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@ @@ -244,6 +246,7 @@ else LIBZSTD = libzstd.$(SHARED_EXT_VER) $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): CFLAGS += -fPIC $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden +$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): | $(ZSTD_DYNLIB_DIR) $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_DYNLIB_OBJ) @echo compiling dynamic library $(LIBVER) $(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ diff --git a/tests/Makefile b/tests/Makefile index 87252ea80..ff67ead9c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -99,7 +99,7 @@ zstd zstd32 zstd-nolegacy: $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" DEBUGLEVEL=$(DEBUGLEVEL) gzstd: - $(MAKE) -C $(PRGDIR) $@ HAVE_ZLIB=1 MOREFLAGS+="$(DEBUGFLAGS)" + $(MAKE) -C $(PRGDIR) $@ HAVE_ZLIB=1 MOREFLAGS+="$(DEBUGFLAGS)" DEBUGLEVEL=$(DEBUGLEVEL) .PHONY: libzstd libzstd :