lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update GCC version to 9.1.0 in Ubuntu 18.04

Browse Source 
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>
This commit is contained in:
Tony Sarajärvi
2019-05-16 13:59:40 +03:00
parent da9aac698d
commit f70bdd89b1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coin/provisioning/common/linux/gcc.sh
View File

@@ -37,6 +37,8 @@
# shellcheck source=../unix/DownloadURL.sh # shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -ex set -ex
@@ -97,6 +99,9 @@ function InstallGCC() {
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
fi 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 echo "GCC = $version" >> ~/versions.txt
} }

3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
View File

@@ -5,5 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh # shellcheck source=../common/linux/gcc.sh
source "${BASH_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