regex.h (basic_regex): Rename _Ch_typeraits template parameters to _Ch_traits.

[gcc.git] / libstdc++-v3 / fragment.am

diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am
index 3506dd27adf1c669a446d38fafab3b4f5e5a1e4c..0036ae8004a3567eb7c1336ee37fc9010eeedcae 100644 (file)
--- a/libstdc++-v3/fragment.am
+++ b/libstdc++-v3/fragment.am
@@ -1,5 +1,8 @@
 
-## This is used in all Makefile.am's except for libmath's.  Set defaults here.
+## This is used in all Makefile.am's.  Set defaults here.
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
 MAINT_CHARSET = latin1
 
@@ -10,12 +13,25 @@ STAMP = echo timestamp >
 toolexecdir = $(glibcxx_toolexecdir)
 toolexeclibdir = $(glibcxx_toolexeclibdir)
 
+if ENABLE_WERROR
+WERROR_FLAG=$(WERROR)
+else
+WERROR_FLAG=
+endif
+
+if ENABLE_EXTERN_TEMPLATE
+XTEMPLATE_FLAGS = -fno-implicit-templates
+else
+XTEMPLATE_FLAGS =
+endif
+
 # These bits are all figured out from configure.  Look in acinclude.m4
 # or configure.ac to see how they are set.  See GLIBCXX_EXPORT_FLAGS.
 CONFIG_CXXFLAGS = \
-       $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS)
+       $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
+
 WARN_CXXFLAGS = \
-       $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
+       $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once 
 
 # -I/-D flags to pass when compiling.
 AM_CPPFLAGS = $(GLIBCXX_INCLUDES)