diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-12-10 21:43:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-12-10 21:43:10 +0000 |
| commit | 9f503dd352f5dd26e32d9aa150b8a466449cf815 (patch) | |
| tree | 8c3d1bb49fccd4392df199baee0f6d5b3df59283 | |
| parent | 729c1f7a6a9508cdeb5336d365773a38b97c7981 (diff) | |
| download | gcc-9f503dd352f5dd26e32d9aa150b8a466449cf815.zip gcc-9f503dd352f5dd26e32d9aa150b8a466449cf815.tar.gz gcc-9f503dd352f5dd26e32d9aa150b8a466449cf815.tar.bz2 | |
re PR libstdc++/11612 (abi_check not finding correct libgcc_s.so.1)
2003-12-10 Benjamin Kosnik <bkoz@redhat.com>
Alexandre Oliva <aoliva@redhat.com>
PR libstdc++/11612
* testsuite/Makefile.am (GLIBCXX_DIR): New.
(GLIBGCC_DIR): New.
(CXXLINK): Use both with -R so libtool links the correct libs.
Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>
From-SVN: r74508
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4af6d4e..c6d75b9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2003-12-10 Benjamin Kosnik <bkoz@redhat.com> + Alexandre Oliva <aoliva@redhat.com> + + PR libstdc++/11612 + * testsuite/Makefile.am (GLIBCXX_DIR): New. + (GLIBGCC_DIR): New. + (CXXLINK): Use both with -R so libtool links the correct libs. + 2003-12-10 Paolo Carlini <pcarlini@suse.de> PR libstdc++/13217 diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 3a03189..0fa3732 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -32,9 +32,12 @@ AM_RUNTESTFLAGS = testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags CXX=`${testsuite_flags_script} --build-cxx` +GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` +GLIBCXX_DIR=${glibcxx_builddir}/src/.libs + CXXLINK = \ - LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcxx_builddir}/src/.libs\ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ + -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ # Generated lists of files to run. All of these names are valid make diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index ca3f4f7..ac6acc1 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -223,9 +223,12 @@ AM_RUNTESTFLAGS = testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags +GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` +GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs + CXXLINK = \ - LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcxx_builddir}/src/.libs\ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ + -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ @@ -239,9 +242,9 @@ lists_of_files = \ noinst_LIBRARIES = libv3test.a libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc -@GLIBCXX_TEST_ABI_FALSE@noinst_PROGRAMS = @GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check +@GLIBCXX_TEST_ABI_FALSE@noinst_PROGRAMS = abi_check_SOURCES = abi_check.cc baseline_file = ${baseline_dir}/baseline_symbols.txt |