summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjules <jules@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-09 10:10:53 +0000
committerjules <jules@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-09 10:10:53 +0000
commitac051731f17f9008a4ff084964d12bd76a8e52ec (patch)
treee068e2cf2b1dce36c13da737f2887b6c7c782ef1
parent70393469205e1baf691721d517f4c6332084fa32 (diff)
downloadgcc-ac051731f17f9008a4ff084964d12bd76a8e52ec.tar.gz
libgfortran/
* Makefile.am (LTLDFLAGS): New. (libgfortran_la_LDFLAGS): Use above. * Makefile.in: Regenerate. libffi/ * Makefile.am (LTLDFLAGS): New. (libffi_la_LDFLAGS): Use above. * Makefile.in: Regenerate. libobjc/ * Makefile.in (LTLDFLAGS): New. (libobjc$(libsuffix).la, libobjc_gc$(libsuffix).la): Use above. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135112 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/Makefile.am4
-rw-r--r--libffi/Makefile.in4
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/Makefile.am4
-rw-r--r--libgfortran/Makefile.in3
-rw-r--r--libobjc/ChangeLog5
-rw-r--r--libobjc/Makefile.in8
8 files changed, 34 insertions, 6 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
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 26ad0395b64..62b00bc121a 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 93a4072d7d8..1c2fa4c22c0 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 686308a7fa0..dc44e4a29d7 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 e3b8d8c828b..046b652248b 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 bfddff2d24d..ee9f6a1f3c5 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.