diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-04-28 22:25:17 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-04-28 22:25:17 (GMT) |
| commit | 9997da0725e0682e0a27084b03914254b2b256bd (patch) | |
| tree | ae053ec79d6dc4735a88beb221315e9a780bc935 | |
| parent | 52304e2e561fc10c34999a9b8506173bafeb3f72 (diff) | |
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.
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 4250da2..30a8285 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -152,6 +152,9 @@ CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state" 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 @@ fi 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" |