- no longer hardcode CXX, but instead make use of %gcc_version,

which is implicitely set in prjconf, which I wasn't aware of ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1384
This commit is contained in:
2025-03-07 10:00:26 +00:00
committed by Git OBS Bridge
parent 544e282c6e
commit 4e7bebe420
2 changed files with 9 additions and 8 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 7 09:56:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
- no longer hardcode CXX, but instead make use of %gcc_version,
which is implicitely set in prjconf, which I wasn't aware of ...
-------------------------------------------------------------------
Thu Mar 6 22:21:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>

View File

@@ -150,7 +150,7 @@
# Leap 15 and SLES 15 defaults to GCC 7, which does not have stable C++17 ABI.
# See https://bugzilla.suse.com/show_bug.cgi?id=1235697
%if 0%{?suse_version} < 1600
%if 0%{?gcc_version} < 13
%define gcc_version 13
%endif
@@ -914,13 +914,8 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%ifarch ppc64 ppc64le
%limit_build -m 1024
%endif
%if 0%{?suse_version} < 1600
export CC=gcc-13
export CXX=g++-13
%else
export CC=gcc
export CXX=g++-14
%endif
export CC=gcc-%{gcc_version}
export CXX=g++-%{gcc_version}
egl_platforms=x11,wayland