diff options
| author | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-01 05:21:07 +0000 |
|---|---|---|
| committer | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-01 05:21:07 +0000 |
| commit | 515f24a1cd07e9ecc1baf590f2577b84e10538a5 (patch) | |
| tree | 5db250608aaddc7e42e083e51a519c71ea2ffa46 /libmudflap/testsuite | |
| parent | 8fb6a6c229ba3b2722fa672396a705718d8f3407 (diff) | |
| download | gcc-515f24a1cd07e9ecc1baf590f2577b84e10538a5.tar.gz | |
* configure.in: Handle multilibs, support
--enable-version-specific-runtime-libs.
* Makefile.am (lib_LTLIBRARIES): Rename to ...
(toolexeclib_LTLIBRARIES): this for multilib support.
* Makefile.in: Regenerated.
* configure: Regenerated.
* aclocal.m4: Regenerated.
* testsuite/lib/libmudflap.exp (libmudflap-init): Handle
multilibs, using multilib directory instead of hardcoded path.
Set LD_RUN_PATH.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82527 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libmudflap/testsuite')
| -rw-r--r-- | libmudflap/testsuite/lib/libmudflap.exp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index 4e482ecbcd2..6f4b1550c0c 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ proc libmudflap-init { language } { } append ld_library_path ":${blddir}/.libs" - set libs "-L../.libs -L../../../gcc" + set libs "-L${blddir}/.libs" set cxxflags "-ggdb3 -DDEBUG_ASSERT" set includes "-I${srcdir} -I.." @@ -87,7 +87,7 @@ proc libmudflap-init { language } { # c++ libs are included by --build-cxx below set cxx "[exec sh $cxxflags_file --build-cxx]" } else { - lappend libs "-L../../libstdc++-v3/src/.libs" + lappend libs "-L${cxxblddir}src/.libs" lappend includes "-I../../libstdc++-v3/include" } } @@ -95,6 +95,7 @@ proc libmudflap-init { language } { verbose -log "ld_library_path=$ld_library_path" setenv LD_LIBRARY_PATH $ld_library_path setenv SHLIB_PATH $ld_library_path + setenv LD_RUN_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path |