diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b2755b77fe..efc041e0c15 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-13  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Require
+	native testing before setting v3-sharedlib to 1.
+
 2005-10-12  Joe Buck  <Joe.Buck@synopsys.com>
 
 	* docs/html/27_io/howto.html: Use reference to ifstream when
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index ba7da26ce21..3c5397bc5ae 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -133,7 +133,7 @@ proc libstdc++_init { testfile } {
     set v3-sharedlib 0
     set sharedlibdir [lookfor_file $blddir src/.libs/libstdc++.so]
     if {$sharedlibdir != ""} {
-	if { [string match "*-*-linux*" $target_triplet] } {
+	if { [string match "*-*-linux*" $target_triplet] && [isnative] } {
 	    set v3-sharedlib 1
 	    verbose -log "shared library support detected"
 	}