Date: Tue, 22 Aug 2023 20:01:45 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 4101bcfa18c0 - main - libzstd: Explicitly define ZSTD_DISABLE_ASM Message-ID: <202308222001.37MK1jT9083003@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4101bcfa18c0f12a3294971f2f68f354d3e1d864 commit 4101bcfa18c0f12a3294971f2f68f354d3e1d864 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2023-08-22 20:01:03 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2023-08-22 20:01:03 +0000 libzstd: Explicitly define ZSTD_DISABLE_ASM On FreeBSD, ZSTD_ASM_SUPPORTED is defined as 0, but on macOS and Linux it is defined as 1, yet we don't build any of the assembly sources. Rather than add them just for bootstrapping on non-FreeBSD, explicitly define ZSTD_DISABLE_ASM so they're not needed and everything is consistent. This fixes building a bootstrap LLVM toolchain on non-FreeBSD amd64 (the only architecture with assembly available). Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D41543 --- lib/libzstd/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 7b8211d0a584..080b6247fee8 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -38,6 +38,11 @@ CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ -DZSTD_MULTITHREAD=1 -fvisibility=hidden LIBADD= pthread +# ZSTD_ASM_SUPPORTED is 0 on FreeBSD but 1 on macOS and Linux. Since we build +# this as a bootstrap library and don't include any assembly sources in SRCS, +# explicitly disable assembly. +CFLAGS+= -DZSTD_DISABLE_ASM + PRIVATELIB= yes PACKAGE= runtime
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308222001.37MK1jT9083003>