diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-21 05:56:56 +0200 |
commit | eb7370a7afb6c61b7bff0a71d8d19f4dbbe34bef (patch) | |
tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/provisioning/common/linux/gcc.sh | |
parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
parent | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'coin/provisioning/common/linux/gcc.sh')
-rwxr-xr-x | coin/provisioning/common/linux/gcc.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 44ff654b..c26c9bf1 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -37,6 +37,8 @@ # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -ex @@ -81,7 +83,7 @@ function InstallGCC() { sudo make install rm -rf "$targetFile" - rm -rf "$tmpFolder/gcc-$version" + sudo rm -rf "$tmpFolder/gcc-$version" fi # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links @@ -97,6 +99,9 @@ function InstallGCC() { 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 + echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf + sudo ldconfig -v echo "GCC = $version" >> ~/versions.txt } |