Commit 1b5be39f by Steven Bosscher

Makefile.am: Fix regexp broken by previous commit.

	* include/Makefile.am: Fix regexp broken by previous commit.
	* include/Makefile.in: Likewise.

From-SVN: r194152
parent 25626181
2012-12-04 Steven Bosscher <steven@gcc.gnu.org>
* include/Makefile.am: Fix regexp broken by previous commit.
* include/Makefile.in: Likewise.
2012-12-03 Benjamin Kosnik <bkoz@redhat.com> 2012-12-03 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp: * include/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp:
Remove. Remove.
* include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp: * include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp:
Remove. Remove.
* include/Makefile.am (pb_headers): Remove include files. * include/Makefile.am (pb_headers): Remove include files.
* include/Makefile.in: Regenerated. * include/Makefile.in: Regenerated.
2012-12-01 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2012-12-01 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
......
...@@ -1105,7 +1105,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1105,7 +1105,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
externtemplate=`cat stamp-extern-template` ;\ externtemplate=`cat stamp-extern-template` ;\
ldbl_compat='s,g,g,' ;\ ldbl_compat='s,g,g,' ;\
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
${CONFIG_HEADER} > /dev/null 2>&1 \ ${CONFIG_HEADER} > /dev/null 2>&1 \
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
...@@ -1119,7 +1119,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1119,7 +1119,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
< ${CONFIG_HEADER} >> $@ ;\ < ${CONFIG_HEADER} >> $@ ;\
echo "" >> $@ ;\ echo "" >> $@ ;\
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
......
...@@ -1507,7 +1507,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1507,7 +1507,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
externtemplate=`cat stamp-extern-template` ;\ externtemplate=`cat stamp-extern-template` ;\
ldbl_compat='s,g,g,' ;\ ldbl_compat='s,g,g,' ;\
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
${CONFIG_HEADER} > /dev/null 2>&1 \ ${CONFIG_HEADER} > /dev/null 2>&1 \
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
...@@ -1521,7 +1521,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1521,7 +1521,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
< ${CONFIG_HEADER} >> $@ ;\ < ${CONFIG_HEADER} >> $@ ;\
echo "" >> $@ ;\ echo "" >> $@ ;\
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
......
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