From c42f128304e7aed01879945de1cdefcd0c4bd8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 8 Feb 2025 14:34:17 +0100
Subject: [PATCH] llvm-runtimes/offload: Support building 21.x with GCC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 llvm-runtimes/offload/offload-21.0.0.9999.ebuild      | 11 +----------
 .../offload/offload-21.0.0_pre20250208.ebuild         | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/llvm-runtimes/offload/offload-21.0.0.9999.ebuild b/llvm-runtimes/offload/offload-21.0.0.9999.ebuild
index 77e2f9dc17635..449f09fef8cf1 100644
--- a/llvm-runtimes/offload/offload-21.0.0.9999.ebuild
+++ b/llvm-runtimes/offload/offload-21.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+inherit cmake llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP offloading support"
 HOMEPAGE="https://openmp.llvm.org"
@@ -39,10 +39,6 @@ BDEPEND="
 		llvm-core/clang
 	)
 "
-# TODO: can it be fixed to compile with gcc?
-BDEPEND+="
-	llvm-core/clang
-"
 
 LLVM_COMPONENTS=( offload cmake runtimes/cmake libc/shared )
 LLVM_TEST_COMPONENTS=( openmp/cmake )
@@ -67,11 +63,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	# TODO
-	local -x CC=${CHOST}-clang
-	local -x CXX=${CHOST}-clang++
-	strip-unsupported-flags
-
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
diff --git a/llvm-runtimes/offload/offload-21.0.0_pre20250208.ebuild b/llvm-runtimes/offload/offload-21.0.0_pre20250208.ebuild
index 77e2f9dc17635..449f09fef8cf1 100644
--- a/llvm-runtimes/offload/offload-21.0.0_pre20250208.ebuild
+++ b/llvm-runtimes/offload/offload-21.0.0_pre20250208.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+inherit cmake llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP offloading support"
 HOMEPAGE="https://openmp.llvm.org"
@@ -39,10 +39,6 @@ BDEPEND="
 		llvm-core/clang
 	)
 "
-# TODO: can it be fixed to compile with gcc?
-BDEPEND+="
-	llvm-core/clang
-"
 
 LLVM_COMPONENTS=( offload cmake runtimes/cmake libc/shared )
 LLVM_TEST_COMPONENTS=( openmp/cmake )
@@ -67,11 +63,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	# TODO
-	local -x CC=${CHOST}-clang
-	local -x CXX=${CHOST}-clang++
-	strip-unsupported-flags
-
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"