diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2007-03-15 09:14:37 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2007-03-15 09:14:37 +0000 |
| commit | 43e034308853a13ba3117b38a959268404210f15 (patch) | |
| tree | b85004d0dc6d44dd1adbdd51d74981640d2a93cb | |
| parent | c123d98fc605569d999ca1e6a9266419e8607ae6 (diff) | |
| download | gcc-43e034308853a13ba3117b38a959268404210f15.zip gcc-43e034308853a13ba3117b38a959268404210f15.tar.gz gcc-43e034308853a13ba3117b38a959268404210f15.tar.bz2 | |
libstdc++.exp (v3-build_support): If it exists, use env(AR_FOR_TARGET).
* testsuite/lib/libstdc++.exp (v3-build_support) <ar>: If it
exists, use env(AR_FOR_TARGET). Log the command.
<ranlib>: Similar.
From-SVN: r122950
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f6af0df..e042e39 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-03-15 Hans-Peter Nilsson <hp@axis.com> + + * testsuite/lib/libstdc++.exp (v3-build_support) <ar>: If it + exists, use env(AR_FOR_TARGET). Log the command. + <ranlib>: Similar. + 2007-03-14 Nathan Sidwell <nathan@codesourcery.com> Joseph Myers <joseph@codesourcery.com>:: diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index bd79f4b..79cbd9b 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -401,6 +401,7 @@ proc v3_target_compile_as_c { source dest type options } { # Build the support objects linked in with the libstdc++ tests. In # addition, set v3-wchar_t, v3-threads, and v3-symver appropriately. proc v3-build_support { } { + global env global srcdir global v3-wchar_t global v3-threads @@ -466,13 +467,23 @@ proc v3-build_support { } { } # Collect into libtestc++.a - set ar [transform "ar"] + if [info exists env(AR_FOR_TARGET)] { + set ar $env(AR_FOR_TARGET) + } else { + set ar [transform "ar"] + } set arcommand "$ar -rc ./libtestc++.a ${libtest_objs}" + verbose -log "$arcommand" set result [lindex [local_exec "$arcommand" "" "" 300] 0] verbose "link result is $result" if { $result == 0 } { - set ranlib [transform "ranlib"] + if [info exists env(RANLIB_FOR_TARGET)] { + set ranlib $env(RANLIB_FOR_TARGET) + } else { + set ranlib [transform "ranlib"] + } set ranlibcommand "$ranlib ./libtestc++.a" + verbose -log "$ranlibcommand" set result [lindex [local_exec "$ranlibcommand" "" "" 300] 0] if { $result != 0 } { error "could not link libtestc++.a" |