From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Wed, 2 Dec 2020 01:59:56 +0000 (-0800)
Subject: Merge pull request #2348 from dscheg/dev
X-Git-Tag: v1.4.7~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6112b8252631dca8696f319c19d252458b60f9c3;p=thirdparty%2Fzstd.git

Merge pull request #2348 from dscheg/dev

Fix dll path in case of cross-compilation
---

6112b8252631dca8696f319c19d252458b60f9c3
diff --cc lib/Makefile
index aab6715a5,c1650b95f..7a736d32e
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -249,44 -197,23 +249,44 @@@ endi
  
  ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
  
- LIBZSTD = dll\libzstd.dll
+ LIBZSTD = dll/libzstd.dll
  $(LIBZSTD): $(ZSTD_FILES)
  	@echo compiling dynamic library $(LIBVER)
- 	$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@
+ 	$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll/libzstd.dll.a -shared $^ -o $@
  
 -else
 +else  # not Windows
  
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
 -$(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
 -$(LIBZSTD): $(ZSTD_FILES)
 +.PHONY: $(LIBZSTD)  # must be run every time
 +$(LIBZSTD): CFLAGS += -fPIC
 +$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden
 +
 +ifndef BUILD_DIR
 +# determine BUILD_DIR from compilation flags
 +
 +$(LIBZSTD):
 +	$(SET_CACHE_DIRECTORY)
 +
 +else
 +# BUILD_DIR is defined
 +
 +ZSTD_DYNLIB_DIR := $(BUILD_DIR)/dynamic
 +ZSTD_DYNLIB := $(ZSTD_DYNLIB_DIR)/$(LIBZSTD)
 +ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/,$(ZSTD_LOCAL_OBJ))
 +
 +$(ZSTD_DYNLIB): | $(ZSTD_DYNLIB_DIR)
 +$(ZSTD_DYNLIB): $(ZSTD_DYNLIB_OBJ)
  	@echo compiling dynamic library $(LIBVER)
 -	$(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 +	$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
  	@echo creating versioned links
 -	$(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
 -	$(Q)ln -sf $@ libzstd.$(SHARED_EXT)
 +	ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
 +	ln -sf $@ libzstd.$(SHARED_EXT)
  
 -endif
 +$(LIBZSTD): $(ZSTD_DYNLIB)
 +	ln -sf $< $@
 +
 +endif  # ifndef BUILD_DIR
 +endif  # if windows
  
  .PHONY: libzstd
  libzstd : $(LIBZSTD)