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: r74510

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 949801b0ddab271459d05a12afd6325705bc0e8f..1e7254407a9fae8a0f15be717b24293b55606b5a 100644 (file)
--- 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-08  David S. Miller  <davem@redhat.com>
 
        PR libstdc++/12496

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index af17d877253d7f2afe8f7722c2276c507358374f..0d4ca741d1c7f3a9de56cb47deba865bde993f77 100644 (file)
--- 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 edf0627a4570a646bf8fcdad3c663d479a927adf..3161ddd89248bafc1103b67e960c0bff93c51589 100644 (file)
--- 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 $@