diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-17 05:56:15 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-17 05:56:15 +0000 |
| commit | f259ef2dde37cdc1994ab89de4202de11db1758d (patch) | |
| tree | fa16d409fa166f36caaced4b9b18b5c11655a10f /libffi | |
| parent | f901aa342fec3c1daf7be7c1f6258571542389b1 (diff) | |
| download | gcc-f259ef2dde37cdc1994ab89de4202de11db1758d.tar.gz | |
2008-05-17 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r135459
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@135460 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 6 | ||||
| -rw-r--r-- | libffi/Makefile.am | 4 | ||||
| -rw-r--r-- | libffi/Makefile.in | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 2049dfc22cc..e39201103c6 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2008-05-09 Julian Brown <julian@codesourcery.com> + + * Makefile.am (LTLDFLAGS): New. + (libffi_la_LDFLAGS): Use above. + * Makefile.in: Regenerate. + 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 diff --git a/libffi/Makefile.am b/libffi/Makefile.am index a9962686bcf..6bc8c1b0ea3 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -156,7 +156,9 @@ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) + +libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/libffi/Makefile.in b/libffi/Makefile.in index d7245a51038..e97f0c866a7 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -71,6 +71,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ + $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ @@ -440,7 +441,8 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) all: fficonfig.h |