From fcd37b9845e4b4a362e7f2bb570955fad623bac8 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 6 Jun 2021 10:44:09 +0200 Subject: [PATCH] Require GCC 12 on Leap The default compiler in Leap doesn't match the Qt requirements. Use the latest compiler version available on Leap. Change-Id: I0c4ad87af4dd60d12fa09366eb9910edafcc9c4c --- mkspecs/common/g++-base.conf | 6 +++--- mkspecs/common/gcc-base.conf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf index d392879f66..5aac58a546 100644 --- a/mkspecs/common/g++-base.conf +++ b/mkspecs/common/g++-base.conf @@ -8,14 +8,14 @@ # you can use the manual test in tests/manual/mkspecs. # -QMAKE_COMPILER = gcc +QMAKE_COMPILER = gcc-12 -QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CC = $${CROSS_COMPILE}gcc-12 QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_CXX = $${CROSS_COMPILE}g++-12 QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index ae58326289..7bc6a54ccb 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -124,8 +124,8 @@ QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2 QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2 # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code -QMAKE_AR_LTCG = gcc-ar cqs -QMAKE_NM_LTCG = gcc-nm -P +QMAKE_AR_LTCG = gcc-ar-12 cqs +QMAKE_NM_LTCG = gcc-nm-12 -P QMAKE_RANLIB_LTCG = true # No need to run since gcc-ar has "s" QMAKE_LINK_OBJECT_SCRIPT = object_script -- 2.41.0