diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2020-02-10 12:43:31 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-02-19 11:01:15 +0200 |
| commit | 7e126af82ffd02550b71d9eaeeb56b387ea89ab0 (patch) | |
| tree | 635402de5dfe6a5ceeb809ac644279e18e5a9c1b /coin/provisioning/common | |
| parent | 769362560f49578bff4a5a64ce1568e2b34dd3b5 (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>
Diffstat (limited to 'coin/provisioning/common')
| -rwxr-xr-x | coin/provisioning/common/linux/gcc.sh | 16 |
1 files changed, 8 insertions, 8 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 |