Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6

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
 }