From 5af79da3e8e90a67968227b8c3bcf2f49c3d454f Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 7 Jan 2023 10:56:09 +0000 Subject: [PATCH] sys-devel/llvm: Drop unnecessary cross-compiling aids from V16 I was pleasantly surprised to find that these are no longer needed, as a native build of llvm-tblgen is now automatically done when cross-compiling. Signed-off-by: James Le Cuirot --- sys-devel/llvm/llvm-16.0.0.9999.ebuild | 10 ---------- sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild | 10 ---------- sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild | 10 ---------- sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild | 10 ---------- 4 files changed, 40 deletions(-) diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild index 38faaf5b1adfd..60cde39577b6a 100644 --- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild @@ -420,16 +420,6 @@ multilib_src_configure() { ) fi - if tc-is-cross-compiler; then - local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild index 9a91d21695fd4..68c8e75e5b318 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild @@ -420,16 +420,6 @@ multilib_src_configure() { ) fi - if tc-is-cross-compiler; then - local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild index 9a91d21695fd4..68c8e75e5b318 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild @@ -420,16 +420,6 @@ multilib_src_configure() { ) fi - if tc-is-cross-compiler; then - local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506 diff --git a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild index 4798e7ef18588..5b6c7934d02c6 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild @@ -420,16 +420,6 @@ multilib_src_configure() { ) fi - if tc-is-cross-compiler; then - local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - # workaround BMI bug in gcc-7 (fixed in 7.4) # https://bugs.gentoo.org/649880 # apply only to x86, https://bugs.gentoo.org/650506