X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Ffragment.am;h=216c572fc60e43e35859f47c48e742e0c7729bfc;hb=cfbc8fbb37e7b406ab2567ac35629793d4b499e7;hp=5b1d503a6d7eacd1b9a34a618ce309fc79893800;hpb=b1d6986c94998636277821cb24b9b310da5f23e3;p=gcc.git

diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am
index 5b1d503a6d7..216c572fc60 100644
--- a/libstdc++-v3/fragment.am
+++ b/libstdc++-v3/fragment.am
@@ -2,7 +2,7 @@
 ## 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)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 
 MAINT_CHARSET = latin1
 
@@ -14,19 +14,25 @@ toolexecdir = $(glibcxx_toolexecdir)
 toolexeclibdir = $(glibcxx_toolexeclibdir)
 
 if ENABLE_WERROR
-WERROR_FLAG=$(WERROR)
+WERROR_FLAG = -Werror
 else
-WERROR_FLAG=
+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) $(HWCAP_FLAGS) -frandom-seed=$@
+	$(SECTION_FLAGS) $(HWCAP_CFLAGS) -frandom-seed=$@
 
 WARN_CXXFLAGS = \
 	$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)