From 31788f01961758978eecd7475a66155c48c51f2c Mon Sep 17 00:00:00 2001 From: bkoz Date: Mon, 25 Oct 2004 20:32:40 +0000 Subject: [PATCH] 2004-10-25 Benjamin Kosnik * testsuite/Makefile.am (GLIBCXX_INCLUDES): Add. (AUTOMAKE_OPTIONS): Add nostdinc. * testsuite/Makefile.in: Regenerate. * scripts/testsuite_flags.in (build-includes): Remove redundant search for libsupc++. * fragment.am: Clean. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89550 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/fragment.am | 4 ---- libstdc++-v3/scripts/testsuite_flags.in | 2 +- libstdc++-v3/testsuite/Makefile.am | 3 ++- libstdc++-v3/testsuite/Makefile.in | 6 +++--- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8ef259f24ca..a60d1b47643 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,14 @@ 2004-10-25 Benjamin Kosnik + * testsuite/Makefile.am (GLIBCXX_INCLUDES): Add. + (AUTOMAKE_OPTIONS): Add nostdinc. + * testsuite/Makefile.in: Regenerate. + * scripts/testsuite_flags.in (build-includes): Remove redundant + search for libsupc++. + * fragment.am: Clean. + +2004-10-25 Benjamin Kosnik + * include/Makefile.am (tr1_headers): Add tuple. * include/Makefile.in: Regenerate. diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am index d0d03a28f7b..3506dd27adf 100644 --- a/libstdc++-v3/fragment.am +++ b/libstdc++-v3/fragment.am @@ -20,7 +20,3 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) - - - -## vim:ft=automake diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index 2a74f4782db..392072f175c 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -33,7 +33,7 @@ case ${query} in echo ${INCLUDES} ;; --build-includes) - INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@ -I${SRC_DIR}/libsupc++ + INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@ -I${SRC_DIR}/include/backward -I${SRC_DIR}/testsuite" echo ${INCLUDES} ;; diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index a003497ecaf..371ab72e43d 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -AUTOMAKE_OPTIONS = dejagnu +AUTOMAKE_OPTIONS = dejagnu nostdinc include $(top_srcdir)/fragment.am @@ -31,6 +31,7 @@ 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) GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 1005b34e58d..018e26f938c 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -65,7 +65,7 @@ PROGRAMS = $(noinst_PROGRAMS) am_abi_check_OBJECTS = abi_check.$(OBJEXT) abi_check_OBJECTS = $(am_abi_check_OBJECTS) abi_check_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = depcomp = am__depfiles_maybe = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,7 +143,7 @@ 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 = @GLIBCXX_INCLUDES@ +GLIBCXX_INCLUDES = $(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@ @@ -249,7 +249,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ toplevel_srcdir = @toplevel_srcdir@ -AUTOMAKE_OPTIONS = dejagnu +AUTOMAKE_OPTIONS = dejagnu nostdinc MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs PWD_COMMAND = $${PWDCMD-pwd} -- 2.11.4.GIT