* 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
2004-10-25 Benjamin Kosnik <bkoz@redhat.com>
+ * 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 <bkoz@redhat.com>
+
* include/Makefile.am (tr1_headers): Add tuple.
* include/Makefile.in: Regenerate.
# -I/-D flags to pass when compiling.
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-
-
-
-## vim:ft=automake
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}
;;
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS = dejagnu nostdinc
include $(top_srcdir)/fragment.am
## 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,/[^/]*$$,,'`
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) \
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@
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}