diff options
| -rwxr-xr-x | coin/provisioning/common/linux/gcc.sh | 16 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 2 |
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 |