From d7d89a581688ad780ea43d5a15c04b0fe2c04cdb Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Mon, 12 May 2003 00:41:35 +0000 Subject: Makefile.am: Properly quote /both/ LD_RUN_PATHs. 2003-05-11 Phil Edwards * testsuite/Makefile.am: Properly quote /both/ LD_RUN_PATHs. * testsuite/Makefile.in: Regenerate. From-SVN: r66706 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/Makefile.am | 2 +- libstdc++-v3/testsuite/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9a7dbbb..ca97f01 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2003-05-11 Phil Edwards + * testsuite/Makefile.am: Properly quote /both/ LD_RUN_PATHs. + * testsuite/Makefile.in: Regenerate. + +2003-05-11 Phil Edwards + * testsuite/Makefile.am: Properly quote LD_RUN_PATH. * testsuite/Makefile.in: Regenerate. diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index e7aab0f..9ea3427 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -41,7 +41,7 @@ RUNTESTFLAGS = CXX_build = @glibcpp_CXX@ CXX=`echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'` CXXLINK = \ - LD_RUN_PATH=$${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\ + LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 87c248c..119470d 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -158,7 +158,7 @@ RUNTESTFLAGS = CXX_build = @glibcpp_CXX@ CXX = `echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'` -CXXLINK = LD_RUN_PATH=$${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ INCLUDES = -nostdinc++ @GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ -- cgit v1.1