diff options
| author | Hafiz Abid Qadeer <abidh@codesourcery.com> | 2018-11-07 22:41:21 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2018-11-07 15:41:21 -0700 |
| commit | e9f3803db32c8dd499fe9da64558d30f6a920cc9 (patch) | |
| tree | 032080e3009e66f710d7f59dcc5a8775475ffa45 /libstdc++-v3/configure | |
| parent | 48b2caf016f12c48ca43024c45d080b5333a1ca9 (diff) | |
| download | gcc-e9f3803db32c8dd499fe9da64558d30f6a920cc9.zip gcc-e9f3803db32c8dd499fe9da64558d30f6a920cc9.tar.gz gcc-e9f3803db32c8dd499fe9da64558d30f6a920cc9.tar.bz2 | |
iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
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
Diffstat (limited to 'libstdc++-v3/configure')
| -rwxr-xr-x | libstdc++-v3/configure | 8 |
1 files changed, 4 insertions, 4 deletions
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 |