summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2021-06-03 07:45:22 -0600
committerJens Axboe <axboe@kernel.dk>2021-06-03 07:45:22 -0600
commit019b7fc4ac11ba70f22f224ec8c87ca2f26bffda (patch)
tree3e0cd27644f228d997efc8d20b1f0926930890b2
parent575686bb85fa36f326524c505e83c54abc0d2f2b (diff)
parent4b0e335a05f3a082a4f051304ba9bb6f36af4432 (diff)
downloadfio-019b7fc4ac11ba70f22f224ec8c87ca2f26bffda.tar.gz
fio-019b7fc4ac11ba70f22f224ec8c87ca2f26bffda.tar.bz2
Merge branch 'evelu-test' of https://github.com/ErwanAliasr1/fio
* 'evelu-test' of https://github.com/ErwanAliasr1/fio: Makefile: Avoid using built-in stpcpy during clang build ci: Reporting installed msys2 packages ci: Installing missing toolchain
-rw-r--r--Makefile5
-rwxr-xr-xci/appveyor-install.sh2
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ef317373..f57569d5 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,11 @@ ifdef CONFIG_PDB
LDFLAGS += -fuse-ld=lld $(LINK_PDBFILE)
endif
+# If clang, do not use builtin stpcpy as it breaks the build
+ifeq ($(CC),clang)
+ FIO_CFLAGS += -fno-builtin-stpcpy
+endif
+
ifdef CONFIG_GFIO
PROGS += gfio
endif
diff --git a/ci/appveyor-install.sh b/ci/appveyor-install.sh
index c73e4cb5..3137f39e 100755
--- a/ci/appveyor-install.sh
+++ b/ci/appveyor-install.sh
@@ -31,7 +31,9 @@ case "${DISTRO}" in
pacman.exe --noconfirm -S \
mingw-w64-${PACKAGE_ARCH}-clang \
mingw-w64-${PACKAGE_ARCH}-cunit \
+ mingw-w64-${PACKAGE_ARCH}-toolchain \
mingw-w64-${PACKAGE_ARCH}-lld
+ pacman.exe -Q # List installed packages
;;
esac