From 0ad170ba9a50930d38f1776d75ba6ce7b3060fd5 Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Fri, 4 Dec 2015 20:51:35 +0100 Subject: [PATCH] backport: re PR libffi/65726 (libffi fails to build when not bootstrapping: configure: error: C++ preprocessor "/lib/cpp" fails sanity check) 2015-12-04 Andreas Tobler Backport from mainline 2015-12-01 Andreas Tobler PR libffi/65726 * Makefile.def (lang_env_dependencies): Make libffi depend on cxx. * Makefile.in: Regenerate. From-SVN: r231301 --- ChangeLog | 10 ++++++++++ Makefile.def | 1 + Makefile.in | 1 + 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6cdf86a71482..82d7d8878f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2015-12-04 Andreas Tobler + + Backport from mainline + 2015-12-01 Andreas Tobler + + PR libffi/65726 + * Makefile.def (lang_env_dependencies): Make libffi depend + on cxx. + * Makefile.in: Regenerate. + 2015-12-04 Release Manager * GCC 5.3.0 released. diff --git a/Makefile.def b/Makefile.def index e0ea2fbe7123..5abea3effa08 100644 --- a/Makefile.def +++ b/Makefile.def @@ -522,6 +522,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 36b400877561..57a1e45bbf80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50485,6 +50485,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