From bb75d38e7b83b3ffe8ca07a808c8a8a76e331ce9 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Wed, 1 Nov 2023 11:54:01 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2f8d632dfac9..1842e414c55a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -297,6 +297,12 @@ prepare() { _die "ZFS and bcachefs support cannot be built at the same time. " fi + ### Prevent ZFS and LTO building at the same time + # More infos here: https://github.com/openzfs/zfs/issues/15384 + if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then + _die "ZFS and LTO support cannot be built at the same time. " + fi + ### Selecting CachyOS config if [ -n "$_cachy_config" ]; then echo "Enabling CachyOS config..." @@ -666,7 +672,7 @@ build() { make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules fi - if [ -n "$_build_zfs" ]; then + if [[ "$_cpusched" != "rt" && -n "$_build_zfs" ]]; then cd ${srcdir}/"zfs" local CONFIGURE_FLAGS=()