# HG changeset patch # User "Yann E. MORIN" # Date 1325536692 -3600 # Node ID 60f5ceb1b413c02781ff00bec0d229dd9c41be9c # Parent c7fa97debb36bcea78a28a639d1ae569997cc6f2 binutils/binutils: don't install symlinks when in canadian When building a canadian-cross, the binutils are not executable on the build machine, so there is no point in installing the symlinks in the gcc static/shared install dirs. Signed-off-by: "Yann E. MORIN" diff -r c7fa97debb36 -r 60f5ceb1b413 scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh Mon Apr 02 19:50:22 2012 +0200 +++ b/scripts/build/binutils/binutils.sh Mon Jan 02 21:38:12 2012 +0100 @@ -130,16 +130,23 @@ # Make those new tools available to the core C compilers to come. # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as # well. Create that. - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" - for t in "${binutils_tools[@]}"; do - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - done 2>&1 |CT_DoLog ALL + # Don't do it for canadian or cross-native, because the binutils + # are not executable on the build machine. + case "${CT_TOOLCHAIN_TYPE}" in + cross|native) + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" + for t in "${binutils_tools[@]}"; do + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + done 2>&1 |CT_DoLog ALL + ;; + *) ;; + esac CT_EndStep } diff -r c7fa97debb36 -r 60f5ceb1b413 scripts/build/binutils/elf2flt.sh --- a/scripts/build/binutils/elf2flt.sh Mon Apr 02 19:50:22 2012 +0200 +++ b/scripts/build/binutils/elf2flt.sh Mon Jan 02 21:38:12 2012 +0100 @@ -60,16 +60,23 @@ # Make those new tools available to the core C compilers to come. # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as # well. Create that. - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" - for t in elf2flt flthdr; do - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - done 2>&1 |CT_DoLog ALL + # Don't do it for canadian or cross-native, because the binutils + # are not executable on the build machine. + case "${CT_TOOLCHAIN_TYPE}" in + cross|native) + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" + for t in elf2flt flthdr; do + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + done 2>&1 |CT_DoLog ALL + ;; + *) ;; + esac CT_EndStep }