summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.def1
-rw-r--r--Makefile.in1
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84ca02bfb6e..1221651e31a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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-26 David Edelsohn <dje.gcc@gmail.com>
* m4/libtool.m4 (export_symbols_cmds) [AIX]: Add global TLS "L"
diff --git a/Makefile.def b/Makefile.def
index 8b4dad99160..35829801391 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -534,6 +534,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=liboffloadmic; cxx=true; };
lang_env_dependencies = { module=newlib; no_c=true; };
diff --git a/Makefile.in b/Makefile.in
index 75caafd1595..66817b34a70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51034,6 +51034,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