From e9f3803db32c8dd499fe9da64558d30f6a920cc9 Mon Sep 17 00:00:00 2001 From: Hafiz Abid Qadeer Date: Wed, 7 Nov 2018 22:41:21 +0000 Subject: [PATCH] iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. 2018-11-06 Hafiz Abid Qadeer * config/iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. Append $INCICONV to it. gcc/ * configure: Regenerated. libcpp/ * configure: Likewise. libstdc++-v3/ * configure: Likewise. intl/ * configure: Likewise. From-SVN: r265896 --- ChangeLog | 5 +++++ config/iconv.m4 | 2 +- gcc/ChangeLog | 4 ++++ gcc/configure | 2 +- intl/ChangeLog | 4 ++++ intl/configure | 2 +- libcpp/ChangeLog | 4 ++++ libcpp/configure | 2 +- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/configure | 8 ++++---- 10 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d93178..e066279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-11-06 Hafiz Abid Qadeer + + * config/iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. + Append $INCICONV to it. + 2018-11-04 Stafford Horne * MAINTAINERS (Write After Approval): Add myself. diff --git a/config/iconv.m4 b/config/iconv.m4 index 5f9304a..f1e54c5 100644 --- a/config/iconv.m4 +++ b/config/iconv.m4 @@ -73,7 +73,7 @@ AC_DEFUN([AM_ICONV_LINK], if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include #include ], diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c1eef4c..8efe5fa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2018-11-07 Hafiz Abid Qadeer + + * configure: Regenerated. + 2018-11-07 Jozef Lawrynowicz PR c/87691 diff --git a/gcc/configure b/gcc/configure index a24221d..b814484 100755 --- a/gcc/configure +++ b/gcc/configure @@ -10833,7 +10833,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/intl/ChangeLog b/intl/ChangeLog index f4ae3e5..8c93696 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2018-11-07 Hafiz Abid Qadeer + + * configure: Regenerated. + 2018-10-31 Joseph Myers PR bootstrap/82856 diff --git a/intl/configure b/intl/configure index 5881cff..2f35993 100755 --- a/intl/configure +++ b/intl/configure @@ -5639,7 +5639,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 4f28047..a3d3dd6 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2018-11-07 Hafiz Abid Qadeer + + * configure: Regenerated. + 2018-11-05 Martin Liska * symtab.c (ht_dump_statistics): Replace %zu with %lu format. diff --git a/libcpp/configure b/libcpp/configure index 2e98fd1..a7aa35c 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -7165,7 +7165,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bdff031..11cceda 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2018-11-07 Hafiz Abid Qadeer + + * configure: Regenerated. + 2018-11-07 Jonathan Wakely * config/abi/pre/gnu.ver: Fix patterns for size_t parameters. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 3462059..39f83e2 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -28980,7 +28980,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 @@ -41274,7 +41274,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 @@ -47392,7 +47392,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 @@ -60238,7 +60238,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "$am_cv_func_iconv" != yes; then am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$LIBS $INCICONV" + CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -- 2.7.4