aboutsummaryrefslogtreecommitdiff
path: root/gcc/configure
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2024-06-14 13:28:40 +0200
committerJan Beulich <jbeulich@suse.com>2024-06-14 13:28:40 +0200
commit4b1f486fefb3969f35ff6d49f544eb0ac9f49f1f (patch)
treef4a1bc7f59f7fe42625ac08e9752f7538eda2fb0 /gcc/configure
parent1438b15e5430f7fab3832c35d262d6b58caba469 (diff)
downloadgcc-4b1f486fefb3969f35ff6d49f544eb0ac9f49f1f.zip
gcc-4b1f486fefb3969f35ff6d49f544eb0ac9f49f1f.tar.gz
gcc-4b1f486fefb3969f35ff6d49f544eb0ac9f49f1f.tar.bz2
configure: adjustments for building with in-tree binutils
For one setting ld_ver in a conditional (no in-tree ld) when it's used, for x86 at least, in unconditional ways can't be quite right. And then prefixing relative paths to binaries with ${objdir}/, when ${objdir} nowadays resolves to just .libs, can at best be a leftover that wasn't properly cleaned up at some earlier point. gcc/ * configure.ac: Drop ${objdir}/ from NM and AR. Move setting of ld_ver out of conditional. * configure: Re-generate.
Diffstat (limited to 'gcc/configure')
-rwxr-xr-xgcc/configure6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/configure b/gcc/configure
index aaf5899..94970e2 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -9066,7 +9066,7 @@ fi
# NM
if test x${build} = x${host} && test -f $srcdir/../binutils/nm.c \
&& test -d ../binutils ; then
- NM='${objdir}/../binutils/nm-new'
+ NM='../binutils/nm-new'
else
# Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2
@@ -9111,7 +9111,7 @@ fi
# AR
if test x${build} = x${host} && test -f $srcdir/../binutils/ar.c \
&& test -d ../binutils ; then
- AR='${objdir}/../binutils/ar'
+ AR='../binutils/ar'
else
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -25919,8 +25919,8 @@ _ACEOF
+ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q`
if test $in_tree_ld != yes ; then
- ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q`
if echo "$ld_ver" | grep GNU > /dev/null; then
if test x"$ld_is_gold" = xyes; then
# GNU gold --version looks like this: