From f232d6d09a895b4be25cd01008f76afd3a673ac2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 1 Nov 2018 15:50:12 -0700 Subject: Add an ability to modify an exported variable ... and use that ability to permanently set CTNG_LD_IS in case gold is default linker and we're building glibc. Fixes #988. This was a long-standing breakage in crosstool-NG (at least since it began to run each step in a sub-shell). Signed-off-by: Alexey Neyman --- scripts/build/binutils/binutils.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/binutils/binutils.sh') diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index e8060ec5..f61b5563 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -227,9 +227,10 @@ do_binutils_backend() { cp -a "${prefix}/bin/${CT_TARGET}-ld" \ "${prefix}/${CT_TARGET}/bin/ld" - # If needed, force using ld.bfd during the toolchain build - if [ "${CT_BINUTILS_FORCE_LD_BFD}" = "y" ]; then - export CTNG_LD_IS=bfd + # If needed, force using ld.bfd during the toolchain build. + # Note that + if [ "${CT_BINUTILS_FORCE_LD_BFD_DEFAULT}" = "y" ]; then + CT_EnvModify export CTNG_LD_IS bfd fi fi } -- cgit v1.2.3