Mercurialcrosstool-ng / changeset
summary | shortlog | changelog | graph | tags | branches | files | changeset | raw | bz2 | help
binutils/binutils: don't install symlinks when in canadian
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 02 21:38:12 2012 +0100 (2012-01-02)
changeset 292360f5ceb1b413
parent 2922 c7fa97debb36
child 2924 0eab838768b1
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" <yann.morin.1998@anciens.enib.fr>
scripts/build/binutils/binutils.sh file | annotate | diff | revisions
scripts/build/binutils/elf2flt.sh file | annotate | diff | revisions 
     1.1 --- a/scripts/build/binutils/binutils.sh	Mon Apr 02 19:50:22 2012 +0200
     1.2 +++ b/scripts/build/binutils/binutils.sh	Mon Jan 02 21:38:12 2012 +0100
     1.3 @@ -130,16 +130,23 @@
     1.4      # Make those new tools available to the core C compilers to come.
     1.5      # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as
     1.6      # well. Create that.
     1.7 -    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin"
     1.8 -    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
     1.9 -    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
    1.10 -    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
    1.11 -    for t in "${binutils_tools[@]}"; do
    1.12 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    1.13 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    1.14 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    1.15 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    1.16 -    done 2>&1 |CT_DoLog ALL
    1.17 +    # Don't do it for canadian or cross-native, because the binutils
    1.18 +    # are not executable on the build machine.
    1.19 +    case "${CT_TOOLCHAIN_TYPE}" in
    1.20 +        cross|native)
    1.21 +            mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin"
    1.22 +            mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
    1.23 +            mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
    1.24 +            mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
    1.25 +            for t in "${binutils_tools[@]}"; do
    1.26 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    1.27 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    1.28 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    1.29 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    1.30 +            done 2>&1 |CT_DoLog ALL
    1.31 +            ;;
    1.32 +        *)  ;;
    1.33 +    esac
    1.34  
    1.35      CT_EndStep
    1.36  }

     2.1 --- a/scripts/build/binutils/elf2flt.sh	Mon Apr 02 19:50:22 2012 +0200
     2.2 +++ b/scripts/build/binutils/elf2flt.sh	Mon Jan 02 21:38:12 2012 +0100
     2.3 @@ -60,16 +60,23 @@
     2.4      # Make those new tools available to the core C compilers to come.
     2.5      # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as
     2.6      # well. Create that.
     2.7 -    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin"
     2.8 -    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
     2.9 -    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
    2.10 -    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
    2.11 -    for t in elf2flt flthdr; do
    2.12 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    2.13 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    2.14 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    2.15 -        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    2.16 -    done 2>&1 |CT_DoLog ALL
    2.17 +    # Don't do it for canadian or cross-native, because the binutils
    2.18 +    # are not executable on the build machine.
    2.19 +    case "${CT_TOOLCHAIN_TYPE}" in
    2.20 +        cross|native)
    2.21 +            mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin"
    2.22 +            mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
    2.23 +            mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
    2.24 +            mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
    2.25 +            for t in elf2flt flthdr; do
    2.26 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    2.27 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    2.28 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    2.29 +                ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    2.30 +            done 2>&1 |CT_DoLog ALL
    2.31 +            ;;
    2.32 +        *)  ;;
    2.33 +    esac
    2.34  
    2.35      CT_EndStep
    2.36  }
crosstool-ng