diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 2049dfc22cc5f0037d440cfe25e8a2b869884d9a..e39201103c6651b17b8d30fb9df3a17b279d3b04 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 a9962686bcf7bc02d034b83168a66c33a41cba6d..6bc8c1b0ea3b0cefb6153b3877d6025c4ff47570 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 d7245a51038c94fa9133af712f132c2e268c67d0..e97f0c866a7285f9c4aed205a63c6d613d45a119 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 diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 26ad0395b6418dcfe0d316d22eb08cde736bf1a2..62b00bc121af632c40ed3c7ecfce4846da8a65a8 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2008-05-09 Julian Brown <julian@codesourcery.com> + + * Makefile.am (LTLDFLAGS): New. + (libgfortran_la_LDFLAGS): Use above. + * Makefile.in: Regenerate. + 2008-05-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/36131 diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 93a4072d7d855f05601ce62fc29a2dc6a7b91363..1c2fa4c22c075873adf02205369d8100bab19a95 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -13,9 +13,11 @@ else version_arg = endif +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) + toolexeclib_LTLIBRARIES = libgfortran.la libgfortran_la_LINK = $(LINK) -libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) $(version_arg) +libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -lm $(extra_ldflags_libgfortran) $(version_arg) myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 686308a7fa0f65cdf098f8ea422ff46b15673b10..dc44e4a29d7c7a57186c668b780e2f144b68b752 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -920,9 +920,10 @@ ACLOCAL_AMFLAGS = -I .. -I ../config gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) @LIBGFOR_USE_SYMVER_FALSE@version_arg = @LIBGFOR_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/gfortran.map +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) toolexeclib_LTLIBRARIES = libgfortran.la libgfortran_la_LINK = $(LINK) -libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) $(version_arg) +libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -lm $(extra_ldflags_libgfortran) $(version_arg) myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libgfortranbegin_la_SOURCES = fmain.c diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index e3b8d8c828b9a213d563146956e0a3d919a4653c..046b652248b793227dde7965a355a586c3bbdcd5 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-09 Julian Brown <julian@codesourcery.com> + + * Makefile.in (LTLDFLAGS): New. + (libobjc$(libsuffix).la, libobjc_gc$(libsuffix).la): Use above. + 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index bfddff2d24d270bababf68c4c9603271508cab53..ee9f6a1f3c5ea0e9653e4026e1742a30b095c093 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -274,15 +274,19 @@ doc: info dvi pdf html install-html: install-pdf: +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) + libobjc$(libsuffix).la: $(OBJS) $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \ -rpath $(toolexeclibdir) \ - -version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc) + -version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc) \ + $(LTLDFLAGS) libobjc_gc$(libsuffix).la: $(OBJS_GC) $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ -rpath $(toolexeclibdir) \ - -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) + -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) \ + $(LTLDFLAGS) # # FIXME -- The following part does not fit in the libtool context.