From fd707fd95ac77ac59c37d0f79e2b0e7db0f132df Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 30 Sep 2024 21:37:15 -0500 Subject: [PATCH] Really disable use of Clang Apparently commenting it out isn't enough. Resolves: RHEL-59181 --- webkit2gtk3.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index c71a938..aa0ab67 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -10,12 +10,9 @@ %global with_gamepad 1 %endif -# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers -# -# FIXME: Clang toolchain is broken on i686: https://issues.redhat.com/browse/RHEL-59586 -# Disable it everywhere to ensure we use the same toolchain on all architectures. -# -#%global toolchain clang +# FIXME: Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers +# But Clang toolchain is broken on i686: https://issues.redhat.com/browse/RHEL-59586 +# So, for now we'll use GCC instead. # We run out of memory if building with LTO enabled on i686. %ifarch %{ix86} @@ -42,9 +39,9 @@ Patch: webkitgtk-skia-musttail.patch BuildRequires: bison BuildRequires: bubblewrap -BuildRequires: clang BuildRequires: cmake BuildRequires: flex +BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: git BuildRequires: gnupg2