Merge pull request #2687 from sapiippo/dev
Makefile: fix build for mingw
This commit is contained in:
commit
a134737ad4
@ -164,8 +164,8 @@ $(BUILD_DIR)/zstd : $(ZSTD_OBJ)
|
|||||||
$(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
|
$(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT)
|
||||||
|
|
||||||
ifeq ($(HAVE_HASH),1)
|
ifeq ($(HAVE_HASH),1)
|
||||||
SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
|
SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd$(EXT) 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
|
||||||
DSTBIN_HASH = $(shell cat zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
|
DSTBIN_HASH = $(shell cat zstd$(EXT) 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
|
||||||
BIN_ISDIFFERENT = $(if $(filter $(SRCBIN_HASH),$(DSTBIN_HASH)),0,1)
|
BIN_ISDIFFERENT = $(if $(filter $(SRCBIN_HASH),$(DSTBIN_HASH)),0,1)
|
||||||
else
|
else
|
||||||
BIN_ISDIFFERENT = 1
|
BIN_ISDIFFERENT = 1
|
||||||
@ -173,7 +173,7 @@ endif
|
|||||||
|
|
||||||
zstd : $(BUILD_DIR)/zstd
|
zstd : $(BUILD_DIR)/zstd
|
||||||
if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
|
if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \
|
||||||
cp -f $< $@; \
|
cp -f $<$(EXT) $@$(EXT); \
|
||||||
echo zstd build completed; \
|
echo zstd build completed; \
|
||||||
else \
|
else \
|
||||||
echo zstd already built; \
|
echo zstd already built; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user