diff options
| -rw-r--r-- | lto-plugin/ChangeLog | 7 | ||||
| -rw-r--r-- | lto-plugin/Makefile.am | 6 | ||||
| -rw-r--r-- | lto-plugin/Makefile.in | 9 |
3 files changed, 16 insertions, 6 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 2dda3172852..b2011cd56b2 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,10 @@ +2010-12-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * Makefile.am (liblto_plugin_la_DEPENDENCIES): Define. + (liblto_plugin_la_LIBADD): Use -L../libiberty/pic -liberty. + (liblto_plugin_la_LDFLAGS): Use -L../libiberty -liberty. + * Makefile.in: Regenerate. + 2010-12-10 Dave Korn <dave.korn.cygwin@gmail.com> PR middle-end/46674 diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index ba385c76c6f..778f99c6746 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -13,11 +13,13 @@ AM_CFLAGS = -Wall -Werror libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c -liblto_plugin_la_LIBADD = \ +liblto_plugin_la_DEPENDENCIES = \ $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) +liblto_plugin_la_LIBADD = \ + $(if $(wildcard ../libiberty/pic/libiberty.a),-L../libiberty/pic -liberty,) # 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) + $(if $(wildcard ../libiberty/pic/libiberty.a),,-L../libiberty -liberty) all: copy_lto_plugin diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index ad53a60a903..3ad4d299c71 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,12 +230,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = -Wall -Werror libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c -liblto_plugin_la_LIBADD = \ +liblto_plugin_la_DEPENDENCIES = \ $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) +liblto_plugin_la_LIBADD = \ + $(if $(wildcard ../libiberty/pic/libiberty.a),-L../libiberty/pic -liberty,) + # 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) + $(if $(wildcard ../libiberty/pic/libiberty.a),,-L../libiberty -liberty) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am |