aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2013-03-30 11:22:02 +0000
committerMatthias Klose <doko@gcc.gnu.org>2013-03-30 11:22:02 +0000
commit6ab7e76a5944b0f0204a98954116d1e7207c7262 (patch)
tree25f18a44b94d8184e0295e92268c0d53a0065260
parent244fdda055ea6e79fe3eb8bcd059b71df7135942 (diff)
downloadgcc-6ab7e76a5944b0f0204a98954116d1e7207c7262.zip
gcc-6ab7e76a5944b0f0204a98954116d1e7207c7262.tar.gz
gcc-6ab7e76a5944b0f0204a98954116d1e7207c7262.tar.bz2
Makefile.def (target_modules): Don't install libffi.
2013-03-30 Matthias Klose <doko@ubuntu.com> * Makefile.def (target_modules): Don't install libffi. * Makefile.in: Regenerate. From-SVN: r197264
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.def2
-rw-r--r--Makefile.in18
3 files changed, 10 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index e7f9cc0..5ddd4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-30 Matthias Klose <doko@ubuntu.com>
+
+ * Makefile.def (target_modules): Don't install libffi.
+ * Makefile.in: Regenerate.
+
2013-02-24 Tilo Schwarz <tilo@tilo-schwarz.de>
* MAINTAINERS (Write After Approval): Add myself.
diff --git a/Makefile.def b/Makefile.def
index 1af7460..90d9653 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -138,7 +138,7 @@ target_modules = { module= libtermcap; no_check=true;
missing=maintainer-clean; };
target_modules = { module= winsup; };
target_modules = { module= libgloss; no_check=true; };
-target_modules = { module= libffi; };
+target_modules = { module= libffi; no_install=true; };
target_modules = { module= libjava; raw_cxx=true;
extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
target_modules = { module= zlib; };
diff --git a/Makefile.in b/Makefile.in
index 08049de..bfbaf03 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38710,13 +38710,8 @@ maybe-install-target-libffi:
@if target-libffi
maybe-install-target-libffi: install-target-libffi
-install-target-libffi: installdirs
- @: $(MAKE); $(unstage)
- @r=`${PWD_COMMAND}`; export r; \
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- $(NORMAL_TARGET_EXPORTS) \
- (cd $(TARGET_SUBDIR)/libffi && \
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+# Dummy target for uninstallable.
+install-target-libffi:
@endif target-libffi
@@ -38725,13 +38720,8 @@ maybe-install-strip-target-libffi:
@if target-libffi
maybe-install-strip-target-libffi: install-strip-target-libffi
-install-strip-target-libffi: installdirs
- @: $(MAKE); $(unstage)
- @r=`${PWD_COMMAND}`; export r; \
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- $(NORMAL_TARGET_EXPORTS) \
- (cd $(TARGET_SUBDIR)/libffi && \
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
+# Dummy target for uninstallable.
+install-strip-target-libffi:
@endif target-libffi