diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-12-15 16:56:26 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-12-15 16:56:26 +0000 |
| commit | 0371cc0fc85461f6a48132a50b1d6d84bcd61561 (patch) | |
| tree | 770118d389764aaa75356802d1f89efe6aaccb0c /lto-plugin | |
| parent | cf8174d792fa9340a4c63380f7f25fe0a85449b1 (diff) | |
Revert last change.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@167859 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'lto-plugin')
| -rw-r--r-- | lto-plugin/ChangeLog | 4 | ||||
| -rw-r--r-- | lto-plugin/Makefile.am | 6 | ||||
| -rw-r--r-- | lto-plugin/Makefile.in | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index b2011cd56b2..62994fcc553 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -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. diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index 778f99c6746..ba385c76c6f 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -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 diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 3ad4d299c71..ad53a60a903 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -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 |