diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-03-01 13:58:48 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-03-01 13:58:48 +0000 |
| commit | 8927b7c02668c81b42e64dbbfad3642becb9ce43 (patch) | |
| tree | 5f0cd1ccb54070ead90f71845e142294d7284ffd | |
| parent | 3c775d2d898a8d71e7c2812587e6d8d71f748fc1 (diff) | |
| download | gcc-8927b7c02668c81b42e64dbbfad3642becb9ce43.zip gcc-8927b7c02668c81b42e64dbbfad3642becb9ce43.tar.gz gcc-8927b7c02668c81b42e64dbbfad3642becb9ce43.tar.bz2 | |
re PR other/32499 (libstdc++ testsuite fails on platforms without ranlib)
libstdc++-v3:
PR libstdc++/32499
* testsuite/Makefile.am (check-DEJAGNU
$(check_DEJAGNU_normal_targets)): Export AR, RANLIB.
* testsuite/Makefile.in: Regenerate.
toplevel:
PR libstdc++/32499
* configure.ac (RANLIB): Default to true.
(STRIP): Likewise.
(RANLIB_FOR_TARGET): Remove superfluous : argument.
* configure: Regenerate.
From-SVN: r157144
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 2 |
6 files changed, 26 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libstdc++/32499 + * configure.ac (RANLIB): Default to true. + (STRIP): Likewise. + (RANLIB_FOR_TARGET): Remove superfluous : argument. + * configure: Regenerate. + 2010-02-17 Rafael Ávila de Espíndola <espindola@google.com> * MAINTAINERS (Plugin, LTO, LTO plugin): Remove myself. @@ -9415,7 +9415,7 @@ fi done if test -z "$ac_cv_prog_RANLIB" ; then - RANLIB=":" + RANLIB="true" fi @@ -9551,7 +9551,7 @@ fi done if test -z "$ac_cv_prog_STRIP" ; then - STRIP=":" + STRIP="true" fi diff --git a/configure.ac b/configure.ac index 3464166..92f3a90 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. # # 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 @@ -3205,8 +3205,8 @@ NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool) NCN_STRICT_CHECK_TOOLS(LD, ld) NCN_STRICT_CHECK_TOOLS(LIPO, lipo) NCN_STRICT_CHECK_TOOLS(NM, nm) -NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :) -NCN_STRICT_CHECK_TOOLS(STRIP, strip, :) +NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, true) +NCN_STRICT_CHECK_TOOLS(STRIP, strip, true) NCN_STRICT_CHECK_TOOLS(WINDRES, windres) NCN_STRICT_CHECK_TOOLS(WINDMC, windmc) NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) @@ -3242,7 +3242,7 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld) ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo) ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm) ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) -ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) +ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib) ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a688f53..1bf4425 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libstdc++/32499 + * testsuite/Makefile.am (check-DEJAGNU + $(check_DEJAGNU_normal_targets)): Export AR, RANLIB. + * testsuite/Makefile.in: Regenerate. + 2010-02-28 Gerald Pfeifer <gerald@pfeifer.com> * doc/html/ext/pb_ds/references.html: Adjust link to SGI's STL diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index d20aba7..c81db8c 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -103,6 +103,8 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp # Run the testsuite in normal mode. check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp + AR="$(AR)"; export AR; \ + RANLIB="$(RANLIB)"; export RANLIB; \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index e6f437e..355691d 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -560,6 +560,8 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp # Run the testsuite in normal mode. check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp + AR="$(AR)"; export AR; \ + RANLIB="$(RANLIB)"; export RANLIB; \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ |