From ed28a07d053f9e4c3487cf7bcae1e497c083aaa9 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 10 Dec 2003 21:53:55 +0000 Subject: [PATCH] re PR libstdc++/11612 (abi_check not finding correct libgcc_s.so.1) 2003-12-10 Benjamin Kosnik Alexandre Oliva 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 From-SVN: r74510 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/testsuite/Makefile.am | 10 +++++++--- libstdc++-v3/testsuite/Makefile.in | 10 +++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 949801b0ddab..1e7254407a9f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2003-12-10 Benjamin Kosnik + Alexandre Oliva + + 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-08 David S. Miller PR libstdc++/12496 diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index af17d877253d..0d4ca741d1c7 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -40,11 +40,15 @@ RUNTESTFLAGS = ## CXX is actually a "C" compiler. These are real C++ programs. ## Do the same thing as `testsuite_flags --build-cxx` -CXX_build = @glibcpp_CXX@ -CXX=`echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'` +testsuite_flags_script=${glibcpp_builddir}/testsuite_flags +CXX=`${testsuite_flags_script} --build-cxx` + +GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` +GLIBCXX_DIR=${glibcpp_builddir}/src/.libs + CXXLINK = \ - LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ + -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ INCLUDES = \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index edf0627a4570..3161ddd89248 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -161,11 +161,15 @@ RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \ AM_RUNTESTFLAGS = RUNTESTFLAGS = -CXX_build = @glibcpp_CXX@ -CXX = `echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'` +testsuite_flags_script = ${glibcpp_builddir}/testsuite_flags +CXX = `${testsuite_flags_script} --build-cxx` + +GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` +GLIBCXX_DIR = ${glibcpp_builddir}/src/.libs + CXXLINK = \ - LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ + -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -- 2.47.2