From 6ed80bc4daaa9c462167ba33f34234692ef7bfad Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Fri, 6 Jul 2007 00:03:03 +0000 Subject: [PATCH] libstdc++.exp (v3-build_support): Use env(AR) and env(RANLIB), not env(AR_FOR_TARGET) and env(RANLIB_FOR_TARGET). * testsuite/lib/libstdc++.exp (v3-build_support): Use env(AR) and env(RANLIB), not env(AR_FOR_TARGET) and env(RANLIB_FOR_TARGET). From-SVN: r126392 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fdfb7806b391..311d1e19b03c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-07-06 Hans-Peter Nilsson + + * testsuite/lib/libstdc++.exp (v3-build_support): Use env(AR) + and env(RANLIB), not env(AR_FOR_TARGET) and env(RANLIB_FOR_TARGET). + 2007-07-05 Joerg Richter PR libstdc++/31957 diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 7a27ad1977de..a0bca54d485e 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -502,8 +502,8 @@ proc v3-build_support { } { } # Collect into libtestc++.a - if [info exists env(AR_FOR_TARGET)] { - set ar $env(AR_FOR_TARGET) + if [info exists env(AR)] { + set ar $env(AR) } else { set ar [transform "ar"] } @@ -512,8 +512,8 @@ proc v3-build_support { } { set result [lindex [local_exec "$arcommand" "" "" 300] 0] verbose "link result is $result" if { $result == 0 } { - if [info exists env(RANLIB_FOR_TARGET)] { - set ranlib $env(RANLIB_FOR_TARGET) + if [info exists env(RANLIB)] { + set ranlib $env(RANLIB) } else { set ranlib [transform "ranlib"] }