diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-08-07 05:13:52 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2015-08-07 01:13:52 -0400 |
| commit | bf5372e7f0c5c0df7f239ce96ce35a2114400269 (patch) | |
| tree | fe4a555c5372a25485b0bc8224f9107f52ef87e6 /gcc | |
| parent | 8c49d0c4190ec35f143daea22147ef1d198120a9 (diff) | |
| download | gcc-bf5372e7f0c5c0df7f239ce96ce35a2114400269.zip gcc-bf5372e7f0c5c0df7f239ce96ce35a2114400269.tar.gz gcc-bf5372e7f0c5c0df7f239ce96ce35a2114400269.tar.bz2 | |
Makefile.def (libiconv): Define bootstrap=true.
2015-08-06 Yaakov Selkowitz <yselkowi@redhat.com>
* Makefile.def (libiconv): Define bootstrap=true.
Mark pdf/html/info as missing.
(configure-gcc): Depend on all-libiconv.
(all-gcc): Ditto.
(configure-libcpp): Ditto.
(all-libcpp): Ditto.
(configure-intl): Ditto.
(all-intl): Ditto.
* Makefile.in: Regenerate.
intl/
* configure: Reflects renaming of configure.in to configure.ac
libcpp/
* configure: Regenerate.
gcc/
* configure.ac: Define LIBICONV_DEP with in-tree libiconv.
* configure: Regenerate.
From-SVN: r226712
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/configure | 7 | ||||
| -rw-r--r-- | gcc/configure.ac | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ffcd947..75b4d94 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-08-06 Yaakov Selkowitz <yselkowi@redhat.com> + + * configure.ac: Define LIBICONV_DEP with in-tree libiconv. + * configure: Regenerate. + 2015-08-06 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> Jiong Wang <jiong.wang@arm.com> diff --git a/gcc/configure b/gcc/configure index 271316a..8e89dd9 100755 --- a/gcc/configure +++ b/gcc/configure @@ -10764,6 +10764,9 @@ _ACEOF # Until we have in-tree GNU iconv: LIBICONV_DEP= +if test -f "$LTLIBICONV"; then + LIBICONV_DEP=$LTLIBICONV +fi @@ -18338,7 +18341,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18341 "configure" +#line 18344 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18444,7 +18447,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18447 "configure" +#line 18450 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 767e288..c7d5d32 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1220,6 +1220,9 @@ AM_ICONV # Until we have in-tree GNU iconv: LIBICONV_DEP= +if test -f "$LTLIBICONV"; then + LIBICONV_DEP=$LTLIBICONV +fi AC_SUBST(LIBICONV_DEP) AM_LC_MESSAGES |