ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-12 13:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix symlinking to multiarch tools on Cygwin

Browse Source 
On cygwin, creating both "foo.exe" and "foo" results in 'ln -sf'
returning an error ("File exists"). However, ln silently removes
the "foo.exe" in this case, so an attempt to re-run the same command
manually then succeeds.

Hence, make binutils.sh also create symlinks with .exe prefix,
using the new & shiny routine.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-04-01 10:12:05 -07:00
parent 88d28e6eed
commit d6bf8e2d98
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/build/binutils/binutils.sh
View File

@ -82,7 +82,6 @@ do_binutils_for_build() {
# Build binutils for host -> target # Build binutils for host -> target
do_binutils_for_host() { do_binutils_for_host() {
local -a binutils_tools
local -a binutils_opts local -a binutils_opts
CT_DoStep INFO "Installing binutils for host" CT_DoStep INFO "Installing binutils for host"
@ -118,26 +117,13 @@ do_binutils_for_host() {
# are not executable on the build machine. # are not executable on the build machine.
case "${CT_TOOLCHAIN_TYPE}" in case "${CT_TOOLCHAIN_TYPE}" in
cross|native) cross|native)
binutils_tools=( ar as ld ranlib strip )
if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
binutils_tools+=( elf2flt flthdr )
fi
case "${CT_BINUTILS_LINKERS_LIST}" in
ld) binutils_tools+=( ld.bfd ) ;;
gold) binutils_tools+=( ld.gold ) ;;
ld,gold) binutils_tools+=( ld.bfd ld.gold ) ;;
gold,ld) binutils_tools+=( ld.bfd ld.gold ) ;;
esac
mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/${CT_TARGET}/bin"
mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/bin" mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/bin"
for t in "${binutils_tools[@]}"; do CT_SymlinkTools "${CT_BUILDTOOLS_PREFIX_DIR}/bin" \
CT_DoExecLog ALL ln -sv \ "${CT_PREFIX_DIR}/bin" \
"${CT_PREFIX_DIR}/${CT_TARGET}/bin/${t}" \ "${CT_TARGET}"
"${CT_BUILDTOOLS_PREFIX_DIR}/${CT_TARGET}/bin/${t}" CT_DoExecLog ALL mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/${CT_TARGET}"
CT_DoExecLog ALL ln -sv \ CT_DoExecLog ALL ln -sv "${CT_PREFIX_DIR}/${CT_TARGET}/bin" \
"${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" \ "${CT_BUILDTOOLS_PREFIX_DIR}/${CT_TARGET}/bin"
"${CT_BUILDTOOLS_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
done
;; ;;
*) ;; *) ;;
esac esac

6
scripts/functions
View File

@ -1784,7 +1784,11 @@ CT_SymlinkTools()
CT_Pushd "${srcdir}" CT_Pushd "${srcdir}"
for t in "${CT_TARGET}-"*; do for t in "${CT_TARGET}-"*; do
if [ -n "${newpfx}" -a "${newpfx}" != "${CT_TARGET}" ]; then if [ "${t}" = "${CT_TARGET}-*" ]; then
# No matching files
break
fi
if [ "${newpfx}" != "${CT_TARGET}" -o "${bindir}" != "${srcdir}" ]; then
_t="${newpfx}-${t#${CT_TARGET}-}" _t="${newpfx}-${t#${CT_TARGET}-}"
CT_DoExecLog ALL ln -sfv "${dirpfx}${t}" "${bindir}/${_t}" CT_DoExecLog ALL ln -sfv "${dirpfx}${t}" "${bindir}/${_t}"
fi fi