Skip to content

R
riscv-gcc-1
Commit b1d6986c by Benjamin Kosnik Committed by Benjamin Kosnik
Options

fragment.am (CONFIG_CXXFLAGS): Remove EXTRA_CXX_FLAGS. 

2012-09-28  Benjamin Kosnik  <bkoz@redhat.com>

	* fragment.am (CONFIG_CXXFLAGS): Remove EXTRA_CXX_FLAGS.
	* libsupc++/Makefile.am (LTCXXCOMPILE): Add EXTRA_CXX_FLAGS here.
	* src/Makefile.am: Same.
	* src/c++98/Makefile.am: Same.
	* src/c++11/Makefile.am: Same.
	* Makefile.in: Regenerated.
	* src/Makefile.am: Same.
	* src/c++11/Makefile.in: Same.
	* src/c++98/Makefile.in: Same.
	* include/Makefile.in: Same.
	* po/Makefile.in: Same.
	* python/Makefile.in: Same.
	* testsuite/Makefile.in: Same.

2012-09-28  Benjamin Kosnik  <bkoz@redhat.com>

	* src/c++98/Makefile.am: Fixup PARALLEL_FLAGS.

From-SVN: r191847
parent 245da6eb
Showing with 52 additions and 31 deletions
libstdc++-v3/ChangeLog
2012-09-28 Benjamin Kosnik <bkoz@redhat.com> 2012-09-28 Benjamin Kosnik <bkoz@redhat.com>
* fragment.am (CONFIG_CXXFLAGS): Remove EXTRA_CXX_FLAGS.
* libsupc++/Makefile.am (LTCXXCOMPILE): Add EXTRA_CXX_FLAGS here.
* src/Makefile.am: Same.
* src/c++98/Makefile.am: Same.
* src/c++11/Makefile.am: Same.
* Makefile.in: Regenerated.
* src/Makefile.am: Same.
* src/c++11/Makefile.in: Same.
* src/c++98/Makefile.in: Same.
* include/Makefile.in: Same.
* po/Makefile.in: Same.
* python/Makefile.in: Same.
* testsuite/Makefile.in: Same.
2012-09-28 Benjamin Kosnik <bkoz@redhat.com>
* src/c++98/Makefile.am: Fixup PARALLEL_FLAGS.
2012-09-28 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Remove ENABLE_PARALLEL. * acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Remove ENABLE_PARALLEL.
* include/Makefile.am: Same. * include/Makefile.am: Same.
* src/c++98/Makefile.am: Same. * src/c++98/Makefile.am: Same.
......
libstdc++-v3/Makefile.in
...@@ -301,7 +301,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -301,7 +301,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/doc/Makefile.in
...@@ -283,7 +283,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -283,7 +283,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/fragment.am
...@@ -22,7 +22,8 @@ endif ...@@ -22,7 +22,8 @@ endif
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/include/Makefile.in
...@@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/libsupc++/Makefile.am
...@@ -179,14 +179,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp ...@@ -179,14 +179,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -333,7 +333,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -333,7 +333,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
...@@ -465,14 +465,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp ...@@ -465,14 +465,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/po/Makefile.in
...@@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/python/Makefile.in
...@@ -297,7 +297,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -297,7 +297,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
libstdc++-v3/src/Makefile.am
...@@ -154,14 +154,14 @@ AM_CXXFLAGS = \ ...@@ -154,14 +154,14 @@ AM_CXXFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug and --enable-cxx-flags.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX \ $(LIBTOOL) --tag CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(INCLUDES) \ --mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/src/Makefile.in
...@@ -323,7 +323,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -323,7 +323,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
...@@ -425,14 +425,14 @@ AM_CXXFLAGS = \ ...@@ -425,14 +425,14 @@ AM_CXXFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug and --enable-cxx-flags.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX \ $(LIBTOOL) --tag CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(INCLUDES) \ --mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/src/c++11/Makefile.am
...@@ -99,14 +99,14 @@ AM_MAKEFLAGS = \ ...@@ -99,14 +99,14 @@ AM_MAKEFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/src/c++11/Makefile.in
...@@ -290,7 +290,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -290,7 +290,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
...@@ -368,14 +368,14 @@ AM_MAKEFLAGS = \ ...@@ -368,14 +368,14 @@ AM_MAKEFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/src/c++98/Makefile.am
...@@ -161,7 +161,7 @@ concept-inst.o: concept-inst.cc ...@@ -161,7 +161,7 @@ concept-inst.o: concept-inst.cc
$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $< $(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
# Use special rules for parallel mode compilation. # Use special rules for parallel mode compilation.
PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
parallel_settings.lo: parallel_settings.cc parallel_settings.lo: parallel_settings.cc
$(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $< $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $<
parallel_settings.o: parallel_settings.cc parallel_settings.o: parallel_settings.cc
...@@ -203,14 +203,14 @@ AM_MAKEFLAGS = \ ...@@ -203,14 +203,14 @@ AM_MAKEFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/src/c++98/Makefile.in
...@@ -306,7 +306,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -306,7 +306,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
...@@ -401,7 +401,7 @@ libc__98convenience_la_SOURCES = $(sources) ...@@ -401,7 +401,7 @@ libc__98convenience_la_SOURCES = $(sources)
GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include
# Use special rules for parallel mode compilation. # Use special rules for parallel mode compilation.
PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
# AM_CXXFLAGS needs to be in each subdirectory so that it can be # AM_CXXFLAGS needs to be in each subdirectory so that it can be
# modified in a per-library or per-sub-library way. Need to manually # modified in a per-library or per-sub-library way. Need to manually
...@@ -440,14 +440,14 @@ AM_MAKEFLAGS = \ ...@@ -440,14 +440,14 @@ AM_MAKEFLAGS = \
# placed after --tag CXX lest things CXX undo the affect of # placed after --tag CXX lest things CXX undo the affect of
# disable-shared. # disable-shared.
# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is # 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is
# last. (That way, things like -O2 passed down from the toplevel can # last. (That way, things like -O2 passed down from the toplevel can
# be overridden by --enable-debug.) # be overridden by --enable-debug.)
LTCXXCOMPILE = \ LTCXXCOMPILE = \
$(LIBTOOL) --tag CXX --tag disable-shared \ $(LIBTOOL) --tag CXX --tag disable-shared \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
......
libstdc++-v3/testsuite/Makefile.in
...@@ -276,7 +276,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) ...@@ -276,7 +276,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4 # 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. # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment