diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
commit | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch) | |
tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/common/linux/gcc.sh | |
parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
parent | 2fb0e4f3521327d7d44b012316fb9e79c11f4366 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.
Conflicts:
.gitmodules
Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
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 } |