From c7b5125d1f05df0ac9b545e0edf7127e8eae4f29 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 7 Feb 2011 08:20:56 +0000 Subject: [PATCH] re PR lto/47225 (cross-compile fails while configuring libgcc with "xgcc: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found") 2011-02-07 Kai Tietz PR lto/47225 * Makefile.am (Wl): New helper for encoding -Wl,. (liblto_plugin_la_LIBADD): Use -Wl for libiberty library. * Makefile.in: Regenerated. From-SVN: r169877 --- lto-plugin/ChangeLog | 7 +++++++ lto-plugin/Makefile.am | 4 +++- lto-plugin/Makefile.in | 7 +++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index bda47ec471fe..1fae1365787f 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,10 @@ +2011-02-07 Kai Tietz + + PR lto/47225 + * Makefile.am (Wl): New helper for encoding -Wl,. + (liblto_plugin_la_LIBADD): Use -Wl for libiberty library. + * Makefile.in: Regenerated. + 2011-01-25 Ian Lance Taylor * lto-plugin.c (gold_version): New static variable. diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index a51bc4a9739e..1e4405389cf7 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -11,11 +11,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = -Wall -Werror AM_LIBTOOLFLAGS = --tag=disable-static +# This can go away when libiberty becomes a normal convenience library +Wl=-Wl, libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c liblto_plugin_la_LIBADD = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) + $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,) # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a) diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 2e283f7a0ebf..f1595f7aa2fe 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -82,7 +82,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(libexecsubdir)" LTLIBRARIES = $(libexecsub_LTLIBRARIES) liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ - ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) + ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,) am_liblto_plugin_la_OBJECTS = lto-plugin.lo liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS) liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -231,10 +231,13 @@ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = -Wall -Werror AM_LIBTOOLFLAGS = --tag=disable-static + +# This can go away when libiberty becomes a normal convenience library +Wl = -Wl, libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c liblto_plugin_la_LIBADD = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) + $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,) # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \