From: Andreas Tobler Date: Fri, 4 Dec 2015 20:25:13 +0000 (+0100) Subject: backport: re PR libffi/65726 (libffi fails to build when not bootstrapping: configure... X-Git-Tag: releases/gcc-4.9.4~472 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e60125e098233612dc75fffe5db6b368226b4385;p=thirdparty%2Fgcc.git 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: r231305 --- diff --git a/ChangeLog b/ChangeLog index 66f5baa755ce..773ee2922cdd 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-11-18 Matthias Klose * configure.ac: Permit also ISL 0.15 with CLooG. diff --git a/Makefile.def b/Makefile.def index cd99dd43af6e..682922913b1b 100644 --- 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 6dd58025eb84..ebbc46f1b144 100644 --- 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