diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/iconv.m4 | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index b7f81e3..f1b6873 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2018-11-09 Hafiz Abid Qadeer <abidh@codesourcery.com> + + * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. + Append $INCICONV to it. + 2018-10-31 Joseph Myers <joseph@codesourcery.com> Merge from GCC: 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 <stdlib.h> #include <iconv.h>], |