summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2012-02-27 10:00:12 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2012-02-27 10:00:12 +0000
commit25bd48de2675a424fea3ac2c1bbdc13180f0371f (patch)
tree5d572400400db9e979399fbbbbe613365ba55b8f /libffi
parent5b9a8c31af0e7d0f743e8ba07a3bbe03042f5869 (diff)
downloadgcc-25bd48de2675a424fea3ac2c1bbdc13180f0371f.tar.gz
PR libffi/52223
* Makefile.am (FLAGS_TO_PASS): Define. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184592 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/Makefile.am3
-rw-r--r--libffi/Makefile.in3
3 files changed, 12 insertions, 0 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index cfb7a2ff4ba..76fb1d4fbf0 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-27 Mikael Pettersson <mikpe@it.uu.se>
+
+ PR libffi/52223
+ * Makefile.am (FLAGS_TO_PASS): Define.
+ * Makefile.in: Regenerate.
+
2012-02-23 Kai Tietz <ktietz@redhat.com>
PR libffi/52221
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index ccbefe64da6..23e002e9645 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -76,6 +76,9 @@ AM_MAKEFLAGS = \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
MAKEOVERRIDES=
toolexeclib_LTLIBRARIES = libffi.la
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 3ac6d29b877..74ee5370131 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -455,6 +455,9 @@ AM_MAKEFLAGS = \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
+
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
MAKEOVERRIDES =
toolexeclib_LTLIBRARIES = libffi.la
noinst_LTLIBRARIES = libffi_convenience.la