diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-08-22 20:01:03 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-08-22 20:01:03 +0000 |
| commit | 4101bcfa18c0f12a3294971f2f68f354d3e1d864 (patch) | |
| tree | 7965ad74402e7519a25bab8e5ee587de16362adf | |
| parent | c9b2751d76bd5a212fedab46512abb533e9ea695 (diff) | |
| download | src-4101bcfa18c0f12a3294971f2f68f354d3e1d864.tar.gz src-4101bcfa18c0f12a3294971f2f68f354d3e1d864.zip | |
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
| -rw-r--r-- | lib/libzstd/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
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 |