OSDN Git Service

* Makefile.am (liblto_plugin_la_DEPENDENCIES): Define.
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 15 Dec 2010 10:29:01 +0000 (10:29 +0000)
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 15 Dec 2010 10:29:01 +0000 (10:29 +0000)
(liblto_plugin_la_LIBADD): Use -L../libiberty/pic -liberty.
(liblto_plugin_la_LDFLAGS): Use -L../libiberty -liberty.
* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167850 138bc75d-0d04-0410-961f-82ee72b054a4

lto-plugin/ChangeLog
lto-plugin/Makefile.am
lto-plugin/Makefile.in

index 2dda317..b2011cd 100644 (file)
@@ -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
index ba385c7..778f99c 100644 (file)
@@ -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
 
index ad53a60..3ad4d29 100644 (file)
@@ -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