projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 48b2caf)
iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
authorHafiz Abid Qadeer <abidh@codesourcery.com>
Wed, 7 Nov 2018 22:41:21 +0000 (22:41 +0000)
committerJeff Law <law@gcc.gnu.org>
Wed, 7 Nov 2018 22:41:21 +0000 (15:41 -0700)
2018-11-06  Hafiz Abid Qadeer  <abidh@codesourcery.com>

* 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 patch | blob | history
config/iconv.m4 patch | blob | history
gcc/ChangeLog patch | blob | history
gcc/configure patch | blob | history
intl/ChangeLog patch | blob | history
intl/configure patch | blob | history
libcpp/ChangeLog patch | blob | history
libcpp/configure patch | blob | history
libstdc++-v3/ChangeLog patch | blob | history
libstdc++-v3/configure patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 2d93178906f1036e9aa75eb6f6613ef02315dccb..e0662790934c0565592ff8dfb0624c74dbfccce3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-06  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * config/iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
+       Append $INCICONV to it.
+
 2018-11-04  Stafford Horne  <shorne@gmail.com>
 
        * MAINTAINERS (Write After Approval): Add myself.
diff --git a/config/iconv.m4 b/config/iconv.m4
index 5f9304a6ba6f6870e42f86b167b7d0fe59ff1f09..f1e54c5aedc99a832eaa223a548c1024361a681d 100644 (file)
--- 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>],
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1eef4c1aa92a1a18579ba4bc4b66619ee171d70..8efe5fa82d3dec563c2140832878cabfe712fa59 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-07  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * configure: Regenerated.
+
 2018-11-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
        PR c/87691
diff --git a/gcc/configure b/gcc/configure
index a24221d580c26caf16d74cdb87311e3b452d0744..b814484ea25b3c50c84b898dc848d6afbb0cdee1 100755 (executable)
--- 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 f4ae3e5ffcb9e6cad36c757804cb4d965c3b89e0..8c936960c30efbf93f0a3e215010e99bbd43704a 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-07  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+        * configure: Regenerated.
+
 2018-10-31  Joseph Myers  <joseph@codesourcery.com>
 
        PR bootstrap/82856
diff --git a/intl/configure b/intl/configure
index 5881cff2d896500d6c65c4e584c380623999f641..2f35993148e526cdb9ce68d04dae16a0e5d7b5ae 100755 (executable)
--- 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 4f280471ba42ab5328b69edf5bb21f88541fee58..a3d3dd6596d50672969a5eb3565bd953ceda2739 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-07  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+        * configure: Regenerated.
+
 2018-11-05  Martin Liska  <mliska@suse.cz>
 
        * symtab.c (ht_dump_statistics): Replace %zu with %lu format.
diff --git a/libcpp/configure b/libcpp/configure
index 2e98fd109516319238db83eacb61c625f249b193..a7aa35c5be0feef51d9c056c4a1810fb25dc7812 100755 (executable)
--- 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 bdff0310e232bbe11914e016a0f5489bfb1f2516..11cceda2188bc055bbc9355b0f34399b8f0fd380 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-07  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+        * configure: Regenerated.
+
 2018-11-07  Jonathan Wakely  <jwakely@redhat.com>
 
        * config/abi/pre/gnu.ver: Fix patterns for size_t parameters.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 34620592cc214a77e97510593d665c1e3bb2e451..39f83e239d7d39cbf74eff9d95b2d23f8ae6916a 100755 (executable)
--- 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