diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2016-05-02 15:23:20 +0000 |
|---|---|---|
| committer | Bernd Edlinger <edlinger@gcc.gnu.org> | 2016-05-02 15:23:20 +0000 |
| commit | 00f357941db820bb038818b698d782d7b58f5432 (patch) | |
| tree | f2db4db5aa9772f25a4902dc36526d362d6605ab /configure.ac | |
| parent | 72407e00fd86e794aa5f0cb36523e43798ad35f8 (diff) | |
configure.ac (mpfr): Remove pre-3.1.0 mpfr compatibility code.
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* configure.ac (mpfr): Remove pre-3.1.0 mpfr compatibility code.
* configure: Regenerated.
* Makefile.def (gmp): Explicitly disable assembler.
(mpfr): Adjust lib_path.
(mpc): Likewise.
* Makefile.in: Regenerated.
gcc/
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* doc/install.texi: Document supported in-tree gmp/mpfr/mpc versions.
contrib/
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* download_prerequisites: Adjust gmp/mpfr/mpc versions.
From-SVN: r235763
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 3aec655d219..20dfbb49878 100644 --- a/configure.ac +++ b/configure.ac @@ -1548,16 +1548,9 @@ if test "x$with_mpfr_lib" != x; then gmplibs="-L$with_mpfr_lib $gmplibs" fi if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then - # MPFR v3.1.0 moved the sources into a src sub-directory. - if test -d ${srcdir}/mpfr/src; then - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" - else - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" - fi + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" # Do not test the mpfr version. Assume that it is sufficient, since # it is in the source tree, and the library has not been built yet # but it would be included on the link line in the version check below |