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

Provisioning: Update GCC to version 9.2 for Ubuntu 18.04

Browse Source 
GCC bug which breaks Webengine build should be fixed in GCC 9.2

Task-number: QTQAINFRA-3534
Change-Id: Ie0df7c67e0e96cca5632bcd0e6a3db822fcbffbe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2020-02-10 12:43:31 +02:00
parent 769362560f
commit 7e126af82f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,15 +88,15 @@ function InstallGCC() {
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
if [ -f "/usr/sbin/update-alternatives" ]; then
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
else
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
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

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

@@ -5,4 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2
InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153