diff options
| author | Andreas Tobler <andreast@gcc.gnu.org> | 2015-12-04 21:25:13 +0100 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2015-12-04 21:25:13 +0100 |
| commit | e60125e098233612dc75fffe5db6b368226b4385 (patch) | |
| tree | ac718a4f3d0c2a3d3f4b782b2128b318cb1306e7 | |
| parent | 6f199e1ac5bad7bace1e6d700b2da2065593840a (diff) | |
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 <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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.def | 1 | ||||
| -rw-r--r-- | Makefile.in | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 66f5baa755c..773ee2922cd 100644 --- 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 cd99dd43af6..682922913b1 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 6dd58025eb8..ebbc46f1b14 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 |