configure.in (DEFAULT_LINKER, [...]): Use grep instead of test and sed to check whether they're GNU programs.
* configure.in (DEFAULT_LINKER, DEFAULT_ASSEMBLER): Use grep instead of test and sed to check whether they're GNU programs. * configure: Rebuilt. From-SVN: r26158
This commit is contained in:
parent
965c3f43f9
commit
e154a394de
@ -1,3 +1,9 @@
|
||||
Sat Apr 3 19:21:05 1999 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* configure.in (DEFAULT_LINKER, DEFAULT_ASSEMBLER): Use grep
|
||||
instead of test and sed to check whether they're GNU programs.
|
||||
* configure: Rebuilt.
|
||||
|
||||
Sat Apr 3 17:57:35 1999 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* Makefile.in (install-headers-tar, install-headers-cpio): avoid
|
||||
|
8
gcc/configure
vendored
8
gcc/configure
vendored
@ -649,7 +649,7 @@ fi
|
||||
if test x"${DEFAULT_LINKER+set}" = x"set"; then
|
||||
if test ! -x "$DEFAULT_LINKER"; then
|
||||
echo "configure: warning: cannot execute: $DEFAULT_LINKER: check --with-ld or env. var. DEFAULT_LINKER" 1>&2
|
||||
elif test "GNU" = `$DEFAULT_LINKER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
|
||||
elif $DEFAULT_LINKER -v < /dev/null 2>&1 | grep GNU > /dev/null; then
|
||||
gnu_ld_flag=yes
|
||||
fi
|
||||
cat >> confdefs.h <<EOF
|
||||
@ -677,7 +677,7 @@ fi
|
||||
if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
|
||||
if test ! -x "$DEFAULT_ASSEMBLER"; then
|
||||
echo "configure: warning: cannot execute: $DEFAULT_ASSEMBLER: check --with-as or env. var. DEFAULT_ASSEMBLER" 1>&2
|
||||
elif test "GNU" = `$DEFAULT_ASSEMBLER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
|
||||
elif $DEFAULT_ASSEMBLER -v < /dev/null 2>&1 | grep GNU > /dev/null; then
|
||||
gas_flag=yes
|
||||
fi
|
||||
cat >> confdefs.h <<EOF
|
||||
@ -1248,7 +1248,7 @@ fi
|
||||
echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
|
||||
echo "configure:1250: checking whether a default assembler was specified" >&5
|
||||
if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
|
||||
if test x"$with_gas" = x"no"; then
|
||||
if test x"$gas_flag" = x"no"; then
|
||||
echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6
|
||||
else
|
||||
echo "$ac_t""yes ($DEFAULT_ASSEMBLER - GNU as)" 1>&6
|
||||
@ -1260,7 +1260,7 @@ fi
|
||||
echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
|
||||
echo "configure:1262: checking whether a default linker was specified" >&5
|
||||
if test x"${DEFAULT_LINKER+set}" = x"set"; then
|
||||
if test x"$with_gnu_ld" = x"no"; then
|
||||
if test x"$gnu_ld_flag" = x"no"; then
|
||||
echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6
|
||||
else
|
||||
echo "$ac_t""yes ($DEFAULT_LINKER - GNU ld)" 1>&6
|
||||
|
@ -98,7 +98,7 @@ DEFAULT_LINKER="$with_ld")
|
||||
if test x"${DEFAULT_LINKER+set}" = x"set"; then
|
||||
if test ! -x "$DEFAULT_LINKER"; then
|
||||
AC_MSG_WARN([cannot execute: $DEFAULT_LINKER: check --with-ld or env. var. DEFAULT_LINKER])
|
||||
elif test "GNU" = `$DEFAULT_LINKER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
|
||||
elif $DEFAULT_LINKER -v < /dev/null 2>&1 | grep GNU > /dev/null; then
|
||||
gnu_ld_flag=yes
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_LINKER,"$DEFAULT_LINKER")
|
||||
@ -116,7 +116,7 @@ DEFAULT_ASSEMBLER="$with_as")
|
||||
if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
|
||||
if test ! -x "$DEFAULT_ASSEMBLER"; then
|
||||
AC_MSG_WARN([cannot execute: $DEFAULT_ASSEMBLER: check --with-as or env. var. DEFAULT_ASSEMBLER])
|
||||
elif test "GNU" = `$DEFAULT_ASSEMBLER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
|
||||
elif $DEFAULT_ASSEMBLER -v < /dev/null 2>&1 | grep GNU > /dev/null; then
|
||||
gas_flag=yes
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_ASSEMBLER,"$DEFAULT_ASSEMBLER")
|
||||
@ -289,7 +289,7 @@ AC_PROG_MAKE_SET
|
||||
|
||||
AC_MSG_CHECKING([whether a default assembler was specified])
|
||||
if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
|
||||
if test x"$with_gas" = x"no"; then
|
||||
if test x"$gas_flag" = x"no"; then
|
||||
AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER)])
|
||||
else
|
||||
AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER - GNU as)])
|
||||
@ -300,7 +300,7 @@ fi
|
||||
|
||||
AC_MSG_CHECKING([whether a default linker was specified])
|
||||
if test x"${DEFAULT_LINKER+set}" = x"set"; then
|
||||
if test x"$with_gnu_ld" = x"no"; then
|
||||
if test x"$gnu_ld_flag" = x"no"; then
|
||||
AC_MSG_RESULT([yes ($DEFAULT_LINKER)])
|
||||
else
|
||||
AC_MSG_RESULT([yes ($DEFAULT_LINKER - GNU ld)])
|
||||
|
Loading…
Reference in New Issue
Block a user