OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2003-12-10 21:43:10 +00:00 committed by Benjamin Kosnik
parent 729c1f7a6a
commit 9f503dd352
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -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

5
libstdc++-v3/testsuite/Makefile.am
View File

@ -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

7
libstdc++-v3/testsuite/Makefile.in
View File

@ -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