From f2ac2b7bcf6294f1c3a8d62b5f2ca78cfc6fb980 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Mon, 21 Dec 2020 15:43:14 -0800 Subject: [PATCH] try to fix cross-compiler tests --- Makefile | 2 +- appveyor.yml | 4 ++-- programs/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7d33b286..bf9cf3e34 100644 --- a/Makefile +++ b/Makefile @@ -227,7 +227,7 @@ ppcbuild: clean CC=powerpc-linux-gnu-gcc CFLAGS="-m32 -Wno-attributes -Werror" $(MAKE) -j allzstd ppc64build: clean - CC=powerpc-linux-gnu-gcc CFLAGS=-Werror TARGET_ARCH=-m64 $(MAKE) -j allzstd + CC=powerpc-linux-gnu-gcc CFLAGS="-m64 -Werror" $(MAKE) -j allzstd armfuzz: clean CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static MOREFLAGS="-static" FUZZER_FLAGS=--no-big-tests $(MAKE) -C $(TESTDIR) fuzztest diff --git a/appveyor.yml b/appveyor.yml index 0e8725575..172159315 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ - COMPILER: "clang" HOST: "mingw" PLATFORM: "x64" - SCRIPT: "MOREFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make allzstd" + SCRIPT: "MOREFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1" BUILD: "true" - COMPILER: "gcc" @@ -204,7 +204,7 @@ - COMPILER: "clang" HOST: "mingw" PLATFORM: "x64" - SCRIPT: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd" + SCRIPT: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1" - COMPILER: "visual" HOST: "visual" diff --git a/programs/Makefile b/programs/Makefile index b6f3a916c..e66d182fe 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -233,7 +233,7 @@ $(BUILD_DIR)/zstd : $(ZSTD_OBJ) @echo "$(LZMA_MSG)" @echo "$(LZ4_MSG)" @echo LINK $@ - $(LINK.o) $^ $(LDLIBS) -o $@$(EXT) + $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) ifeq ($(HAVE_HASH),1) SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ") -- 2.47.2