diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 56f746ab993..ad5ab8d55aa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-24  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/29722 continued
+	* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): Add
+	libsupc++ library directory.
+	* testsuite/abi/cxx_runtime_only_linkage.cc: Remove hard-coded
+	path specification.
+	
 2007-01-24  Andreas Krebbel  <krebbel1@de.ibm.com>
 
 	* libsupc++/eh_personality.cc (parse_lsda_header, check_exception_spec,
diff --git a/libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc b/libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc
index 7e6409ba4d0..30e53848e7e 100644
--- a/libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc
+++ b/libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc
@@ -1,6 +1,6 @@
 // { dg-do link }
-// { dg-options "-x c -L../libsupc++/.libs -lsupc++" }
-// Copyright (C) 2006 Free Software Foundation, Inc.
+// { dg-options "-x c -lsupc++" }
+// Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 4030e6819b5..9308fa562c3 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -1,6 +1,6 @@
 # libstdc++ "tool init file" for DejaGNU
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -359,6 +359,7 @@ proc v3_target_compile_as_c { source dest type options } {
     global wrap_flags
     global includes
     global flags_file
+    global blddir
 
     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
         lappend options "libs=${gluefile}"
@@ -383,8 +384,14 @@ proc v3_target_compile_as_c { source dest type options } {
 	set includesbase "${comp_base_dir}/include/c++/${version}"
 	set includestarget "${includesbase}/${machine}"
 	set cc_final [concat $cc_final "-I$includesbase -I$includestarget"]
+
+        set libsup "${comp_base_dir}/lib"
+    } else {
+        set libsup "${blddir}/libsupc++/.libs"
     }
 
+    set cc_final [concat $cc_final "-L$libsup"]
+
     lappend options "compiler=$cc_final"
     lappend options "timeout=600"