ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-30 16:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts: don't set LD_PRELOAD with static companion libraries

Browse Source 
When cpmpanion libraries are built statically, it is useless to set
LD_PRELOAD. Worse, it might break the build in some corner cases.
This commit is contained in:
Yann E. MORIN" 2010-04-29 00:25:17 +02:00
parent 52304e2e56
commit 9997da0725
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/crosstool-NG.sh.in
View File

@ -152,6 +152,9 @@ CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
CT_CONFIG_DIR="${CT_BUILD_DIR}/configs" CT_CONFIG_DIR="${CT_BUILD_DIR}/configs"
if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
CT_COMPLIBS_DIR="${CT_PREFIX_DIR}" 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 else
CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static" CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static"
fi fi
@ -161,10 +164,6 @@ fi
CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static" 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" 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! # We must ensure that we can restart if asked for!
if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}" ]; then if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}" ]; then
CT_DoLog ERROR "You asked to restart a non-restartable build" CT_DoLog ERROR "You asked to restart a non-restartable build"