summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2019-05-16 13:59:40 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2019-05-31 11:30:45 +0300
commitf70bdd89b17cd58db8a49ee3c5968048d278b772 (patch)
treee38689cab67688cb302fb0f26522ac348d54cf52 /coin
parentda9aac698db1de7db329f8fd3225b037a53862ff (diff)
Update GCC version to 9.1.0 in Ubuntu 18.04
Task-number: QTQAINFRA-2958 Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/common/linux/gcc.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh3
2 files changed, 6 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh
index 44ff654b..44c63e2f 100755
--- a/coin/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -37,6 +37,8 @@
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -ex
@@ -97,6 +99,9 @@ function InstallGCC() {
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
fi
+ echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf
+ echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf
+ sudo ldconfig -v
echo "GCC = $version" >> ~/versions.txt
}
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
index 62940e21..947583da 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
@@ -5,5 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
-InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400
-
+InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2