diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8424ae59015..cb801d1d2e1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2005-03-30 Aaron W. LaFramboise <aaronavay62@aaronwl.com> + + * testsuite/Makefile.am (CXX): Use ${SHELL}. + (GLIBCXX_INCLUDES): Same. + (AM_CXXFLAGS): Same. + * testsuite/Makefile.in: Regenerate. + 2005-03-25 Mark Mitchell <mark@codesourcery.com> * testsuite/lib/libstdc++.exp (libstdc++_init): Define LOCALEDIR diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 12d4752c0bd..868e58beeb1 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -30,9 +30,10 @@ AM_RUNTESTFLAGS = ## CXX is actually a "C" compiler. These are real C++ programs. testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags -CXX = $(shell ${testsuite_flags_script} --build-cxx) -GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes) -AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags) +CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx) +GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \ + --build-includes) +AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags) GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` GLIBCXX_DIR=${glibcxx_builddir}/src/.libs diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index d5f3c3e46e3..1353a7a2309 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -115,7 +115,7 @@ CPPFLAGS = @CPPFLAGS@ CSTDIO_H = @CSTDIO_H@ CTIME_CC = @CTIME_CC@ CTIME_H = @CTIME_H@ -CXX = $(shell ${testsuite_flags_script} --build-cxx) +CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx) CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -142,7 +142,9 @@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@ GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@ -GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes) +GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \ + --build-includes) + GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@ @@ -273,7 +275,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags -AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags) +AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags) GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs CXXLINK = \ |