backport: re PR libffi/65726 (libffi fails to build when not bootstrapping: configure...

2015-12-04  Andreas Tobler  <andreast@gcc.gnu.org>

    Backport from mainline
    2015-12-01  Andreas Tobler  <andreast@gcc.gnu.org>

    PR libffi/65726
    * Makefile.def (lang_env_dependencies): Make libffi depend
    on cxx.
    * Makefile.in: Regenerate.

From-SVN: r231305

diff --git a/ChangeLog b/ChangeLog
index 66f5baa755cedc1d0e5efd694393d78e922f2fa2..773ee2922cdd81ad40cb2d5eed605c16f2aaab96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-12-04  Andreas Tobler  <andreast@gcc.gnu.org>
+
+       Backport from mainline
+       2015-12-01  Andreas Tobler  <andreast@gcc.gnu.org>
+
+       PR libffi/65726
+       * Makefile.def (lang_env_dependencies): Make libffi depend
+       on cxx.
+       * Makefile.in: Regenerate.
+
 2015-11-18  Matthias Klose  <doko@ubuntu.com>
 
        * configure.ac: Permit also ISL 0.15 with CLooG.

diff --git a/Makefile.def b/Makefile.def
index cd99dd43af6eae93197360492bf8a1d8cb77e7a6..682922913b1b49b94ffc1fd001ba24866bf3dbe2 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -499,6 +499,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
 // on libgcc and newlib/libgloss.
 lang_env_dependencies = { module=libjava; cxx=true; };
 lang_env_dependencies = { module=libitm; cxx=true; };
+lang_env_dependencies = { module=libffi; cxx=true; };
 lang_env_dependencies = { module=libcilkrts; cxx=true; };
 lang_env_dependencies = { module=newlib; no_c=true; };
 lang_env_dependencies = { module=libgloss; no_c=true; };

diff --git a/Makefile.in b/Makefile.in
index 6dd58025eb843f7bb10cc5812330a77a2108e0ee..ebbc46f1b14469179b0c7d41e477161adac67747 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47879,6 +47879,7 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
 
 
 configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libffi: maybe-all-target-libstdc++-v3
 
 configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-libjava: maybe-all-target-libstdc++-v3