From 5604c016e7a49484fcf64df5829939f39cbed3d8 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Tue, 3 Oct 2000 07:47:00 +0000 Subject: [PATCH] 2000-10-03 Ben Elliston * config.guess: Do not hold ld's output in a shell variable; feed the output directly into the command pipline to avoid a limitation in variable lengths in ash(1). From Pavel Roskin . --- ChangeLog | 6 ++++++ config.guess | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 831e622..3f55e4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-03 Ben Elliston + + * config.guess: Do not hold ld's output in a shell variable; feed + the output directly into the command pipline to avoid a limitation + in variable lengths in ash(1). From Pavel Roskin . + 2000-09-11 Ben Elliston * config.sub: Handle nsk*. diff --git a/config.guess b/config.guess index 08e8a75..93e03c6 100755 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -version='2000-09-05' +version='2000-10-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -698,8 +698,7 @@ EOF # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_help_string=`cd /; ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ + ld_supported_emulations=`cd /; ld --help 2>&1 \ | sed -ne '/supported emulations:/!d s/[ ][ ]*/ /g s/.*supported emulations: *// @@ -866,8 +865,8 @@ EOF # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. # If ld does not provide *any* "supported emulations:" # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + test -z "$ld_supported_emulations" \ + && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 case "${UNAME_MACHINE}" in i?86)