This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] libstdc++/29722 path fixup
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: libstdc++ at gcc dot gnu dot org
- Date: Wed, 24 Jan 2007 16:06:14 +0100
- Subject: [v3] libstdc++/29722 path fixup
Hi!
This patch fixes up a multilib/install testing mistake with a hard-coded
path, as pointed out by Paolo in bugzilla.
tested x86/linux
best,
benjamin
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.
Index: testsuite/abi/cxx_runtime_only_linkage.cc
===================================================================
--- testsuite/abi/cxx_runtime_only_linkage.cc (revision 121115)
+++ testsuite/abi/cxx_runtime_only_linkage.cc (working copy)
@@ -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
Index: testsuite/lib/libstdc++.exp
===================================================================
--- testsuite/lib/libstdc++.exp (revision 121115)
+++ testsuite/lib/libstdc++.exp (working copy)
@@ -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 @@
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 @@
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"