From f43c39352eb98dd230cb982cf4b50b2718448af4 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 7 Feb 2011 20:32:17 +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 (Wc): New helper for encoding -Wc,. (liblto_plugin_la_LIBADD): Use Wc for libiberty library. (liblto_plugin_la_DEPENDENCIES): Special case pic libiberty. * Makefile.in: Regenerated. From-SVN: r169900 --- lto-plugin/ChangeLog | 8 ++++++++ lto-plugin/Makefile.am | 7 ++++++- lto-plugin/Makefile.in | 10 +++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 014634520ae..1129a378432 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,11 @@ +2011-02-07 Kai Tietz + + PR lto/47225 + * Makefile.am (Wc): New helper for encoding -Wc,. + (liblto_plugin_la_LIBADD): Use Wc for libiberty library. + (liblto_plugin_la_DEPENDENCIES): Special case pic libiberty. + * Makefile.in: Regenerated. + 2011-02-07 Paolo Bonzini Revert: diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index a51bc4a9739..a150f80f50c 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -13,12 +13,17 @@ AM_LIBTOOLFLAGS = --tag=disable-static libexecsub_LTLIBRARIES = liblto_plugin.la +# Can be removed when libiberty becomes a normal convenience library +Wc=-Wc, + 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),$(Wc)../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) +liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ + ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) all: copy_lto_plugin diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 2e283f7a0eb..aa14e52a031 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -81,8 +81,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libexecsubdir)" LTLIBRARIES = $(libexecsub_LTLIBRARIES) -liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ - ../libiberty/pic/libiberty.a),../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) \ @@ -232,14 +230,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = -Wall -Werror AM_LIBTOOLFLAGS = --tag=disable-static libexecsub_LTLIBRARIES = liblto_plugin.la + +# Can be removed when libiberty becomes a normal convenience library +Wc = -Wc, 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),$(Wc)../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) +liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ + ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am