summaryrefslogtreecommitdiff
path: root/scripts/crosstool.sh
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-11-07 08:09:42 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-11-07 08:09:42 (GMT)
commitf9f70c5ad6115b6b65c8ea18a054a3619f4891e9 (patch)
treebfa33e26122af9a19bf8c02db102c4458615de48 /scripts/crosstool.sh
parent15d657ce4e82ba273b27bc154cfdb7bd4bc470d5 (diff)
Do not autodetect 64-bit archs, have them tell be 'select'-ing ARCH_64 in the configuration.
/trunk/scripts/crosstool.sh | 12 5 7 0 +++++------- /trunk/docs/overview.txt | 6 6 0 0 ++++++ /trunk/config/target.in | 4 4 0 0 ++++ /trunk/config/arch/x86_64.in | 1 1 0 0 + /trunk/config/arch/ia64.in | 1 1 0 0 + 5 files changed, 17 insertions(+), 7 deletions(-)
Diffstat (limited to 'scripts/crosstool.sh')
-rwxr-xr-xscripts/crosstool.sh12
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 599fa8a..3438655 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -267,13 +267,11 @@ if [ -z "${CT_RESTART}" ]; then
# Now, in case we're 64 bits, just have lib64/ be a symlink to lib/
# so as to have all libraries in the same directory (we can do that
# because we are *not* multilib).
- case "${CT_TARGET}" in
- powerpc64*|ppc64*|x86_64*)
- ln -sf "lib" "${CT_SYSROOT_DIR}/lib64"
- ln -sf "lib" "${CT_SYSROOT_DIR}/usr/lib64"
- ln -sf "sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib64"
- ;;
- esac
+ if [ "${CT_ARCH_64}" = "y" ]; then
+ ln -sf "lib" "${CT_SYSROOT_DIR}/lib64"
+ ln -sf "lib" "${CT_SYSROOT_DIR}/usr/lib64"
+ ln -sf "sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib64"
+ fi
# Canadian-cross are really picky on the way they are built. Tweak the values.
CT_UNIQ_BUILD=$(echo "${CT_BUILD}" |sed -r -e 's/-/-build_/')