From 18ebd8124ebc976662f1bb62473030b59a315069 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 17 Dec 2010 14:36:49 +0000 Subject: [PATCH] backport: libstdc++.exp (v3-build_support): Delete libtestc++.a before creation. Backport from mainline: 2010-12-10 Rainer Orth * testsuite/lib/libstdc++.exp (v3-build_support): Delete libtestc++.a before creation. From-SVN: r167985 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e2ac9d3e0fce..b75ad6434c16 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2010-12-17 Rainer Orth + + Backport from mainline: + 2010-12-10 Rainer Orth + + * testsuite/lib/libstdc++.exp (v3-build_support): Delete + libtestc++.a before creation. + 2010-12-16 Release Manager * GCC 4.5.2 released. diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 45a43dea5fd5..e749d2236b09 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -586,6 +586,15 @@ proc v3-build_support { } { } # Collect into libtestc++.a + # Delete libtestc++.a first. Mixed 32 and 64-bit archives cannot be + # linked on IRIX 6. + # Use same procedure as gcc-dg.exp (remove-build-file). + if [is_remote host] { + # Ensure the host knows the file is gone by deleting there + # first. + remote_file host delete "./libtestc++.a" + } + remote_file build delete "./libtestc++.a" if [info exists env(AR)] { set ar $env(AR) } else { -- 2.47.2