diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-24 15:03:40 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-24 15:03:40 +0000 |
| commit | 8ae260b8894d16be1c447d592db97d22e8c0efb5 (patch) | |
| tree | c35279ea30a247aedbe505156e1d1de4aa065832 /libstdc++-v3/testsuite | |
| parent | c68b099b2ab366fad3aec65eb17aefd1d9560d75 (diff) | |
| download | ppe42-gcc-8ae260b8894d16be1c447d592db97d22e8c0efb5.tar.gz ppe42-gcc-8ae260b8894d16be1c447d592db97d22e8c0efb5.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121117 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/abi/cxx_runtime_only_linkage.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 9 |
2 files changed, 10 insertions, 3 deletions
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" |
