[lmi-commits] [lmi] master 202119e 2/5: Rework LD_LIBRARY_PATH

[Greg Chicares]

branch: master
commit 202119e5cb24cda4075037ed5bddd9333b4c10cf
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Rework LD_LIBRARY_PATH
---
 set_toolchain.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/set_toolchain.sh b/set_toolchain.sh
index 7182dd1..de4e8d4 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -89,6 +89,7 @@ local   lmi_build_type
         lmi_build_type=$(/usr/share/misc/config.guess)
 
 local      prefix="/opt/lmi"
+local      bindir="$prefix/bin"
 local localbindir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/bin"
 local locallibdir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/lib"
 
@@ -131,16 +132,17 @@ case "$lmi_build_type" in
                 export WINEPATH="$w0;$w1"
                 export  PERFORM="wine"
                 ;;
+            (x86_64-pc-linux-gnu)
+                # Using LD_LIBRARY_PATH is not ideal, but it does work.
+                export LD_LIBRARY_PATH
+                LD_LIBRARY_PATH=.
+                LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$locallibdir"
+                LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$bindir"
+                ;;
         esac
         ;;
     (*) ;;
 esac
-    # For pc-linux-gnu, this is not ideal, but it does work.
-    export LD_LIBRARY_PATH
-    LD_LIBRARY_PATH=.
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/lmi/local/"gcc_${LMI_TRIPLET}"/lib
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/lmi/bin
-
 }
 
 # This script is to be sourced, so use 'return' because 'exit' would