[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/

[Sam James]

commit:     54038a305c6e45414841ffb8c1a73e9c166e80ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 13:21:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 13:21:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54038a30

Revert "sys-fs/zfs-kmod: add Clang logic"

Seems to break building with Clang with GCC-compiled kernels :(

This reverts commit 7b55c828e5df46717ed9eaecd18598eaaacab856.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild | 18 ------------------
 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild  | 18 ------------------
 2 files changed, 36 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
index cb47cb1d7d8b..2c6ab28bcfde 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
@@ -111,24 +111,6 @@ pkg_setup() {
 
        kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 
-       if tc-is-clang ; then
-               # See bug #814194
-               ewarn "Warning: building ${PN} with LLVM/Clang is experimental!"
-               export KERNEL_CC="$(tc-getBUILD_CC)"
-
-               if tc-ld-is-lld ; then
-                       export KERNEL_LD="$(tc-getBUILD_LD)"
-
-                       KERNEL_LLVM=1
-
-                       local tool
-                       for tool in AR NM STRIP OBJCOPY READELF; do
-                               [[ $(tc-getBUILD_${tool}) != *llvm-${tool,,} ]] 
&& KERNEL_LLVM=0
-                       done
-                       export KERNEL_LLVM
-               fi
-       fi
-
        linux-mod_pkg_setup
 }
 

diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index cb47cb1d7d8b..2c6ab28bcfde 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -111,24 +111,6 @@ pkg_setup() {
 
        kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 
-       if tc-is-clang ; then
-               # See bug #814194
-               ewarn "Warning: building ${PN} with LLVM/Clang is experimental!"
-               export KERNEL_CC="$(tc-getBUILD_CC)"
-
-               if tc-ld-is-lld ; then
-                       export KERNEL_LD="$(tc-getBUILD_LD)"
-
-                       KERNEL_LLVM=1
-
-                       local tool
-                       for tool in AR NM STRIP OBJCOPY READELF; do
-                               [[ $(tc-getBUILD_${tool}) != *llvm-${tool,,} ]] 
&& KERNEL_LLVM=0
-                       done
-                       export KERNEL_LLVM
-               fi
-       fi
-
        linux-mod_pkg_setup
 }