diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-09-07 01:22:37 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-09-07 01:22:37 +0200 |
| commit | 3e7036062c37eedd5244f794389f98b6d1dbbad0 (patch) | |
| tree | ecc830f0842cbbe355ea7ecaeb662916d2f8242b | |
| parent | c1ce4b21d19454111ed0b2e11b72a419bc02d5cb (diff) | |
| download | crosstool-ng-3e7036062c37eedd5244f794389f98b6d1dbbad0.tar.gz crosstool-ng-3e7036062c37eedd5244f794389f98b6d1dbbad0.tar.bz2 crosstool-ng-3e7036062c37eedd5244f794389f98b6d1dbbad0.zip | |
scripts: fix sysroot prefix dir
The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .
Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.
Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 463a6423..c2f35f6b 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -273,7 +273,7 @@ if [ -z "${CT_RESTART}" ]; then # Arrange paths depending on wether we use sysroot or not. if [ "${CT_USE_SYSROOT}" = "y" ]; then - CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}" + CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX:+${CT_SYSROOT_DIR_PREFIX}/}${CT_SYSROOT_NAME}" CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_REL_DIR}" CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root" CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include" @@ -317,7 +317,9 @@ if [ -z "${CT_RESTART}" ]; then if [ "${CT_USE_SYSROOT}" = "y" ]; then # Prevent gcc from installing its libraries outside of the sysroot - CT_DoExecLog ALL ln -sf ".${CT_SYSROOT_REL_DIR}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" + CT_Pushd "${CT_PREFIX_DIR}/${CT_TARGET}" + CT_DoExecLog ALL ln -sf "${CT_SYSROOT_REL_DIR}/lib" "lib" + CT_Popd fi # Since we're *not* multilib on the target side, we want all the |