Fix broken sed command from previous commit
* src/c++11/Makefile.am: Fix sed command. * src/c++11/Makefile.in: Regenerate. From-SVN: r259374
This commit is contained in:
parent
4807c076ea
commit
272277dc55
|
@ -1,5 +1,8 @@
|
|||
2018-04-13 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* src/c++11/Makefile.am: Fix sed command.
|
||||
* src/c++11/Makefile.in: Regenerate.
|
||||
|
||||
* src/c++11/Makefile.am: Rewrite sed rule to be less fragile and to
|
||||
handle mangled names starting with double underscores on darwin.
|
||||
* src/c++11/Makefile.in: Regenerate.
|
||||
|
|
|
@ -128,7 +128,7 @@ hashtable_c++0x.o: hashtable_c++0x.cc
|
|||
|
||||
if ENABLE_DUAL_ABI
|
||||
# Rewrite the type info for __ios_failure.
|
||||
rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
||||
rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,/_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
||||
|
||||
cxx11-ios_failure-lt.s: cxx11-ios_failure.cc
|
||||
$(LTCXXCOMPILE) -S $< -o tmp-cxx11-ios_failure-lt.s
|
||||
|
|
|
@ -435,7 +435,7 @@ sources = \
|
|||
libc__11convenience_la_SOURCES = $(sources) $(inst_sources)
|
||||
|
||||
# Rewrite the type info for __ios_failure.
|
||||
@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
||||
@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,/_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
||||
|
||||
# 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
|
||||
|
|
Loading…
Reference in New Issue