]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
try to fix cross-compiler tests 2438/head
authorYann Collet <cyan@fb.com>
Mon, 21 Dec 2020 23:43:14 +0000 (15:43 -0800)
committerYann Collet <cyan@fb.com>
Mon, 21 Dec 2020 23:43:14 +0000 (15:43 -0800)
Makefile
appveyor.yml
programs/Makefile

index c7d33b2866fcd086a4ecbf054104f043722ab40e..bf9cf3e340ee6e79b3d05413935676b524615ab1 100644 (file)
--- 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
index 0e872557525a949169581689d1f08287bdfca7bc..172159315dc27ef426518276aa87fab5c1403ee5 100644 (file)
@@ -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"
     - 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"
index b6f3a916c28e6d1e8fc9c3cc632574d085579258..e66d182fece2e3c70f04e57dd69b9d41412a5305 100644 (file)
@@ -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 " ")