diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-07 17:08:11 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-07 17:08:11 +0000 |
| commit | 23608da4dba98f09398d6a608c8f8a57c37f8280 (patch) | |
| tree | 4645835b5b59c9e5aa46ad01214c98d4fb23e8f0 | |
| parent | dd37378003635f34249819e39435a4f5cca90c8b (diff) | |
| download | gcc-23608da4dba98f09398d6a608c8f8a57c37f8280.zip gcc-23608da4dba98f09398d6a608c8f8a57c37f8280.tar.gz gcc-23608da4dba98f09398d6a608c8f8a57c37f8280.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ebd789c..affe204 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-01-07 Jonathan Wakely <jwakely@redhat.com> + + * libsupc++/Makefile.am: Compile del_ops.cc as C++14. + * libsupc++/Makefile.in: Regenerate. + 2015-01-06 Jonathan Wakely <jwakely@redhat.com> * 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 06e56b6..aace1a6 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 9a1d725..50fee54 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) |