[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/binary-factory-tooling] custom-jobs/kmymoney: Try symlinks to override the compiler instea
From:       Ben Cooksley <null () kde ! org>
Date:       2018-09-12 8:22:03
Message-ID: E1g00PT-0003Y6-Gi () code ! kde ! org
[Download RAW message or body]

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_Build.pipeline


https://commits.kde.org/sysadmin/binary-factory-tooling/38ad17ef88d5a0d049664ca62eb6640b9a0ffdf4


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=$HOME/tools/bin/:$PATH
-				export CC=gcc-6
-				export CXX=g++-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-workspace/ \
$WORKSPACE/kmymoney/  """
diff --git a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipeline \
b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipeline index \
                954baec..2a4f464 100644
--- a/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipeline
+++ b/custom-jobs/kmymoney/KMyMoney_Nightly_Appimage_Dependency_Build.pipeline
@@ -27,8 +27,11 @@ timestamps {
 			// Then we invoke them!
 			sh """
 				export PATH=$HOME/tools/bin/:$PATH
-				export CC=gcc-6
-				export CXX=g++-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-workspace/ \
$WORKSPACE/kmymoney/  """


[prev in list] [next in list] [prev in thread] [next in thread]