[lmi-commits] [lmi] master c850f2bc 4/8: Augment $LD_LIBRARY_PATH for clang

[Greg Chicares]

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

    Augment $LD_LIBRARY_PATH for clang
    
    Without this change, 'libxsltwrapp.so.4' is not found at run time.
---
 set_toolchain.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/set_toolchain.sh b/set_toolchain.sh
index 22940938..151cc0e3 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -98,9 +98,12 @@ local 
locallibdir="$prefix/local/${LMI_COMPILER}_${LMI_TRIPLET}/lib"
 
 # Directory where clang can find gcc-built '*-config' scripts.
 local clanggccbindir
+# Directory where clang can find gcc-built libraries.
+local clanggcclibdir
 case "$LMI_COMPILER" in
     (clang)
         clanggccbindir="$prefix/local/gcc_${LMI_TRIPLET}/bin"
+        clanggcclibdir="$prefix/local/gcc_${LMI_TRIPLET}/lib"
         ;;
     (*) ;;
 esac
@@ -148,6 +151,7 @@ case "$lmi_build_type" in
                 LD_LIBRARY_PATH=.
                 LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$locallibdir"
                 LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$bindir"
+                
LD_LIBRARY_PATH="$LD_LIBRARY_PATH${clanggcclibdir:+:${clanggcclibdir}}"
                 # Nullify any leftover "wine" values: obligatorily for
                 # $EXEEXT and $PERFORM, and for $WINEPATH to ensure
                 # that native builds never depend upon it.