[lmi-commits] [lmi] master 7fbe9e6 1/5: Move LD_LIBRARY_PATH

[Greg Chicares]

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

    Move LD_LIBRARY_PATH
    
    This commit: literal move. Next commit: resettle in new location.
---
 install_msw.sh   | 6 ------
 set_toolchain.sh | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index 497950c..7ae47b7 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -285,12 +285,6 @@ do
     # Source this script only for commands that depend upon it.
     . ./set_toolchain.sh
 
-    # 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
-
     make "$coefficiency" --output-sync=recurse wx_config_check
     make "$coefficiency" --output-sync=recurse show_flags
     make "$coefficiency" --output-sync=recurse clean
diff --git a/set_toolchain.sh b/set_toolchain.sh
index 66308c8..7182dd1 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -135,6 +135,12 @@ case "$lmi_build_type" in
         ;;
     (*) ;;
 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