Commit b131a44e by Aaron W. LaFramboise Committed by Aaron W. LaFramboise

Makefile.am (CXX): Use ${SHELL}.

	* testsuite/Makefile.am (CXX): Use ${SHELL}.
	(GLIBCXX_INCLUDES): Same.
	(AM_CXXFLAGS): Same.
	* testsuite/Makefile.in: Regenerate.

From-SVN: r97281
parent 0b8495ae
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> 2005-03-25 Mark Mitchell <mark@codesourcery.com>
* testsuite/lib/libstdc++.exp (libstdc++_init): Define LOCALEDIR * testsuite/lib/libstdc++.exp (libstdc++_init): Define LOCALEDIR
......
...@@ -30,9 +30,10 @@ AM_RUNTESTFLAGS = ...@@ -30,9 +30,10 @@ AM_RUNTESTFLAGS =
## CXX is actually a "C" compiler. These are real C++ programs. ## CXX is actually a "C" compiler. These are real C++ programs.
testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
CXX = $(shell ${testsuite_flags_script} --build-cxx) CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx)
GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes) GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \
AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags) --build-includes)
AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags)
GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`
GLIBCXX_DIR=${glibcxx_builddir}/src/.libs GLIBCXX_DIR=${glibcxx_builddir}/src/.libs
......
...@@ -115,7 +115,7 @@ CPPFLAGS = @CPPFLAGS@ ...@@ -115,7 +115,7 @@ CPPFLAGS = @CPPFLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CTIME_CC = @CTIME_CC@ CTIME_CC = @CTIME_CC@
CTIME_H = @CTIME_H@ CTIME_H = @CTIME_H@
CXX = $(shell ${testsuite_flags_script} --build-cxx) CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx)
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
...@@ -142,7 +142,9 @@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ ...@@ -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_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@ GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@
GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@ 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_FALSE = @GLIBCXX_TEST_ABI_FALSE@
GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@ GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@
...@@ -273,7 +275,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) ...@@ -273,7 +275,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
AM_MAKEFLAGS = -j1 AM_MAKEFLAGS = -j1
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags 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,/[^/]*$$,,'` GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`
GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs
CXXLINK = \ CXXLINK = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment