summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-02-10 12:43:31 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-02-19 11:01:15 +0200
commit7e126af82ffd02550b71d9eaeeb56b387ea89ab0 (patch)
tree635402de5dfe6a5ceeb809ac644279e18e5a9c1b
parent769362560f49578bff4a5a64ce1568e2b34dd3b5 (diff)
Provisioning: Update GCC to version 9.2 for Ubuntu 18.04
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>
-rwxr-xr-xcoin/provisioning/common/linux/gcc.sh16
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh2
2 files changed, 9 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh
index c26c9bf1..06fe8bf7 100755
--- a/coin/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -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
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 947583da..6c6a90c8 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,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