ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/facebook/dev' into gz_compress

Browse Source 
# Conflicts:
#	programs/Makefile
This commit is contained in:
Przemyslaw Skibinski
2017-02-13 20:47:01 +01:00
parent 4f9eaa7bb3 acfa151622
commit 5a3bb05bb2
10 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/Makefile
+1 -3
View File
@@ -67,11 +67,9 @@ endif
# zlib detection
VOID = /dev/null
HAVE_ZLIB := $(shell echo -e "\#include <zlib.h>\nint main(){}" | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(){}' | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
ifeq ($(HAVE_ZLIB), 1)
TEMP := $(shell rm have_zlib$(EXT))
endif
ifeq ($(HAVE_ZLIB), 1)
ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
ZLIBLD = -lz
endif