This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Committed: Fix configure.ac, aclocal.m4 for combined tree, spacebefore VERSION=
- From: Hans-Peter Nilsson <hp at bitrange dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 17 Sep 2004 08:49:48 -0400 (EDT)
- Subject: Committed: Fix configure.ac, aclocal.m4 for combined tree, spacebefore VERSION=
With bfd/configure 1.185, the combined-tree builds broke in the configure
feature tests:
...
checking what assembler to use... expr: syntax error
"newly built gas"
checking what linker to use... "newly built ld"
checking what nm to use... "newly built nm"
checking what objdump to use... "newly built objdump"
checking assembler for .balign and .p2align... /x/combined/cvs_write/gcc/configure: test: -ge: unary operator expected
no
checking assembler for .p2align with maximum skip... /x/combined/cvs_write/gcc/configure: test: -ge: unary operator expected
...
This was because a space was introduced, seemingly by autoconf, so
"VERSION=" became " VERSION=". The patch adjusts for this. Tested cross
to mmix-knuth-mmixware (combined tree), cris-axis-elf (combined tree, not
building binutils), cris-axis-linux-gnu (combined tree), and native
i686-pc-linux-gnu (no combined tree) by inspecting configure output. The
sed construct ("-n" "/p") is used elsewhere in configure (setting
lang_alias), so obviously portable.
Committed as obvious.
* configure.ac (gcc_cv_gld_version): Handle whitespace before
"VERSION=".
* aclocal.m4 (_gcc_COMPUTE_GAS_VERSION): Ditto.
* configure: Regenerate.
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/gcc/aclocal.m4,v
retrieving revision 1.92
diff -p -c -r1.92 aclocal.m4
*** aclocal.m4 3 Aug 2004 20:33:23 -0000 1.92
--- aclocal.m4 17 Sep 2004 12:03:51 -0000
*************** for f in $gcc_cv_as_bfd_srcdir/configure
*** 570,576 ****
$gcc_cv_as_gas_srcdir/configure \
$gcc_cv_as_gas_srcdir/configure.in \
$gcc_cv_as_gas_srcdir/Makefile.in ; do
! gcc_cv_gas_version=`grep '^VERSION=[[0-9]]*\.[[0-9]]*' $f`
if test x$gcc_cv_gas_version != x; then
break
fi
--- 570,576 ----
$gcc_cv_as_gas_srcdir/configure \
$gcc_cv_as_gas_srcdir/configure.in \
$gcc_cv_as_gas_srcdir/Makefile.in ; do
! gcc_cv_gas_version=`sed -n -e 's/^[[ ]]*\(VERSION=[[0-9]]*\.[[0-9]]*.*\)/\1/p' < $f`
if test x$gcc_cv_gas_version != x; then
break
fi
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.66
diff -p -c -r2.66 configure.ac
*** configure.ac 15 Sep 2004 17:02:55 -0000 2.66
--- configure.ac 17 Sep 2004 12:03:53 -0000
*************** elif test -f $gcc_cv_ld_gld_srcdir/confi
*** 1872,1878 ****
for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
do
changequote(,)dnl
! gcc_cv_gld_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
changequote([,])dnl
if test x$gcc_cv_gld_version != x; then
break
--- 1872,1878 ----
for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
do
changequote(,)dnl
! gcc_cv_gld_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f`
changequote([,])dnl
if test x$gcc_cv_gld_version != x; then
break
brgds, H-P