From 23608da4dba98f09398d6a608c8f8a57c37f8280 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 7 Jan 2015 17:08:11 +0000 Subject: [PATCH] Makefile.am: Compile del_ops.cc as C++14. * libsupc++/Makefile.am: Compile del_ops.cc as C++14. * libsupc++/Makefile.in: Regenerate. From-SVN: r219317 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/libsupc++/Makefile.am | 6 ++++++ libstdc++-v3/libsupc++/Makefile.in | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ebd789c219d..affe20416bb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-01-07 Jonathan Wakely + + * libsupc++/Makefile.am: Compile del_ops.cc as C++14. + * libsupc++/Makefile.in: Regenerate. + 2015-01-06 Jonathan Wakely * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name(). diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 06e56b65b25..aace1a6fe76 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -177,6 +177,12 @@ new_opnt.lo: new_opnt.cc new_opnt.o: new_opnt.cc $(CXXCOMPILE) -std=gnu++11 -c $< +# Use special rules for the C++14 sources so that the proper flags are passed. +del_ops.lo: del_ops.cc + $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_ops.o: del_ops.cc + $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< + # 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 # set this option because CONFIG_CXXFLAGS has to be after diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 9a1d725e360..50fee54a922 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -870,6 +870,12 @@ new_opnt.lo: new_opnt.cc new_opnt.o: new_opnt.cc $(CXXCOMPILE) -std=gnu++11 -c $< +# Use special rules for the C++14 sources so that the proper flags are passed. +del_ops.lo: del_ops.cc + $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< +del_ops.o: del_ops.cc + $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $< + install-stdHEADERS: $(std_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(stddir) -- 2.30.2