From kde-commits  Wed Sep 12 08:22:03 2018
From: Ben Cooksley <null () kde ! org>
Date: Wed, 12 Sep 2018 08:22:03 +0000
To: kde-commits
Subject: [sysadmin/binary-factory-tooling] custom-jobs/kmymoney: Try symlinks to override the compiler instea
Message-Id: <E1g00PT-0003Y6-Gi () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153674053524353

Git commit 38ad17ef88d5a0d049664ca62eb6640b9a0ffdf4 by Ben Cooksley.
Committed on 12/09/2018 at 08:21.
Pushed by bcooksley into branch 'master'.

Try symlinks to override the compiler instead.
Qt doesn't respect CC/CXX it seems, so hopefully this masks the older GCC/G=
++ properly and keeps it happy

M  +5    -2    custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Build.pipeline
M  +5    -2    custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Bu=
ild.pipeline

https://commits.kde.org/sysadmin/binary-factory-tooling/38ad17ef88d5a0d0496=
64ca62eb6640b9a0ffdf4

diff --git a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Build.pipeline =
b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Build.pipeline
index b4f73c5..c06db7e 100644
--- a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Build.pipeline
+++ b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Build.pipeline
@@ -39,8 +39,11 @@ timestamps {
 			// Otherwise we leave everything in the hands of that script
 			sh """
 				export PATH=3D$HOME/tools/bin/:$PATH
-				export CC=3Dgcc-6
-				export CXX=3Dg++-6
+
+				ln -s /usr/bin/gcc-6 $HOME/tools/bin/cc
+				ln -s /usr/bin/gcc-6 $HOME/tools/bin/gcc
+				ln -s /usr/bin/g++-6 $HOME/tools/bin/c++
+				ln -s /usr/bin/g++-6 $HOME/tools/bin/g++
 =

 				kmymoney/packaging/linux/appimage/build-kmymoney.sh $HOME/appimage-wor=
kspace/ $WORKSPACE/kmymoney/
 			"""
diff --git a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Buil=
d.pipeline b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Buil=
d.pipeline
index 954baec..2a4f464 100644
--- a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipel=
ine
+++ b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipel=
ine
@@ -27,8 +27,11 @@ timestamps {
 			// Then we invoke them!
 			sh """
 				export PATH=3D$HOME/tools/bin/:$PATH
-				export CC=3Dgcc-6
-				export CXX=3Dg++-6
+
+				ln -s /usr/bin/gcc-6 $HOME/tools/bin/cc
+				ln -s /usr/bin/gcc-6 $HOME/tools/bin/gcc
+				ln -s /usr/bin/g++-6 $HOME/tools/bin/c++
+				ln -s /usr/bin/g++-6 $HOME/tools/bin/g++
 =

 				kmymoney/packaging/linux/appimage/build-deps.sh $HOME/appimage-workspa=
ce/ $WORKSPACE/kmymoney/
 			"""