This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: Use ${SHELL} to run testsuite_flags in libstdc++-v3
- From: "Aaron W. LaFramboise" <aaronavay62 at aaronwl dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>, libstdc++ at gcc dot gnu dot org
- Date: Wed, 30 Mar 2005 07:27:44 -0600
- Subject: PATCH: Use ${SHELL} to run testsuite_flags in libstdc++-v3
Somehow, the last time I did CVS update, CVS lost the execute permission
on some of the files in libstdc++-v3/scripts, causing bootstrap to later
fail here:
Making all in testsuite
/aaronwl/cs/env/mingw-head/20050330/build/gcc/i686-pc-mingw32/libstdc++-v3/scripts/testsuite_flags:
not found
...
DHAVE_CONFIG_H -g -O2 -c -o testsuite_abi.o
/aaronwl/cs/compilers/gcc/src/cvs/head/gcc/libstdc++-v3/testsuite/testsuite_abi.cc
...
DHAVE_CONFIG_H: not found
...
ar cru libv3test.a testsuite_abi.o testsuite_allocator.o testsuite_hooks.o
c:\aaronwl\cs\env\mingw-head\20050330\bin\ar.exe: testsuite_abi.o: No
such file or directory
make[5]: *** [libv3test.a] Error 1
The attached patch fixes this problem by explicitly invoking the scripts
with the shell.
Tested on i686-pc-mingw32.
OK?
2005-03-30 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
* testsuite/Makefile: Regenerate.
* testsuite/Makefile.am (CXX): Use ${SHELL}.
(GLIBCXX_INCLUDES): Same.
(AM_CXXFLAGS): Same.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/Makefile.am,v
retrieving revision 1.43
diff -c -3 -p -r1.43 Makefile.am
*** Makefile.am 24 Mar 2005 06:54:46 -0000 1.43
--- Makefile.am 30 Mar 2005 13:14:03 -0000
*************** AM_RUNTESTFLAGS =
*** 30,38 ****
## 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)
GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`
GLIBCXX_DIR=${glibcxx_builddir}/src/.libs
--- 30,39 ----
## CXX is actually a "C" compiler. These are real C++ programs.
testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
! 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