OSDN Git Service

Revert last change.
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 15 Dec 2010 16:56:26 +0000 (16:56 +0000)
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 15 Dec 2010 16:56:26 +0000 (16:56 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167859 138bc75d-0d04-0410-961f-82ee72b054a4

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

index b2011cd..62994fc 100644 (file)
@@ -1,5 +1,9 @@
 2010-12-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
+       Revert last change.
+
+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.
index 778f99c..ba385c7 100644 (file)
@@ -13,13 +13,11 @@ AM_CFLAGS = -Wall -Werror
 libexecsub_LTLIBRARIES = liblto_plugin.la
 
 liblto_plugin_la_SOURCES = lto-plugin.c
-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,)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),../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),,-L../libiberty -liberty)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
 
 all: copy_lto_plugin
 
index 3ad4d29..ad53a60 100644 (file)
@@ -81,6 +81,8 @@ 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) \
@@ -230,15 +232,12 @@ 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_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,)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),../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),,-L../libiberty -liberty)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
 
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am