# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1272493517 -7200
# Node ID 94b8465b45f3c50f22b14e22426613d3513d51c1
# Parent  384b7f8fc7809f00c7c1b0fed951973e7e12d684
scripts: don't set LD_PRELOAD with static companion libraries

When cpmpanion libraries are built statically, it is useless to set
LD_PRELOAD. Worse, it might break the build in some corner cases.

diff -r 384b7f8fc780 -r 94b8465b45f3 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Wed Apr 28 22:24:01 2010 +0200
+++ b/scripts/crosstool-NG.sh.in	Thu Apr 29 00:25:17 2010 +0200
@@ -152,6 +152,9 @@
 CT_CONFIG_DIR="${CT_BUILD_DIR}/configs"
 if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
     CT_COMPLIBS_DIR="${CT_PREFIX_DIR}"
+    # Set LD_LIBRARY_PATH to point to prefix/lib so we can find our own
+    # libraries; add as first path, so we get hit first by the dynamic linker
+    CT_SetLibPath "${CT_COMPLIBS_DIR}/lib" first
 else
     CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static"
 fi
@@ -161,10 +164,6 @@
 CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
 CT_CC_CORE_SHARED_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-shared"
 
-# Set LD_LIBRARY_PATH to point to prefix/lib so we can find our own
-# libraries; add as first path, so we get hit first by the dynamic linker
-CT_SetLibPath "${CT_PREFIX_DIR}/lib" first
-
 # We must ensure that we can restart if asked for!
 if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}"  ]; then
     CT_DoLog ERROR "You asked to restart a non-restartable build"