summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorHafiz Abid Qadeer <abidh@codesourcery.com>2018-11-09 16:03:11 +0000
committerHafiz Abid Qadeer <abidh@codesourcery.com>2018-11-09 16:08:10 +0000
commit5d762de01cc537cec47d3c7bbae0424a33b33b04 (patch)
tree8e9e199a4f5aab9b61a61b27de6a777b0e6c7af7 /config
parentdfbfec241aa0ec5359906dd9cdf89ff90750d7c5 (diff)
downloadbinutils-gdb-5d762de01cc537cec47d3c7bbae0424a33b33b04.tar.gz
Fix a typo in iconv.m4.
config/ 2018-11-09 Hafiz Abid Qadeer <abidh@codesourcery.com> * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. Append $INCICONV to it. gdb/ 2018-11-09 Hafiz Abid Qadeer <abidh@codesourcery.com> * configure: Regenerate. binutils/ 2018-11-09 Hafiz Abid Qadeer <abidh@codesourcery.com> * configure: Regenerate. intl/ 2018-11-09 Hafiz Abid Qadeer <abidh@codesourcery.com> * configure: Regenerate.
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog5
-rw-r--r--config/iconv.m42
2 files changed, 6 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index b7f81e3b6ac..f1b68731882 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 5f9304a6ba6..f1e54c5aedc 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>],