Skip to content

R
riscv-gcc-1
Commit be3ea0c8 by Rainer Orth Committed by Rainer Orth
Options

Revert last change. 

From-SVN: r167859
parent b121d18c
Showing with 10 additions and 9 deletions
lto-plugin/ChangeLog
2010-12-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 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. * Makefile.am (liblto_plugin_la_DEPENDENCIES): Define.
(liblto_plugin_la_LIBADD): Use -L../libiberty/pic -liberty. (liblto_plugin_la_LIBADD): Use -L../libiberty/pic -liberty.
(liblto_plugin_la_LDFLAGS): Use -L../libiberty -liberty. (liblto_plugin_la_LDFLAGS): Use -L../libiberty -liberty.
......
lto-plugin/Makefile.am
...@@ -13,13 +13,11 @@ AM_CFLAGS = -Wall -Werror ...@@ -13,13 +13,11 @@ AM_CFLAGS = -Wall -Werror
libexecsub_LTLIBRARIES = liblto_plugin.la libexecsub_LTLIBRARIES = liblto_plugin.la
liblto_plugin_la_SOURCES = lto-plugin.c 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 = \ 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 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ 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 all: copy_lto_plugin
......
lto-plugin/Makefile.in
...@@ -81,6 +81,8 @@ am__base_list = \ ...@@ -81,6 +81,8 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libexecsubdir)" am__installdirs = "$(DESTDIR)$(libexecsubdir)"
LTLIBRARIES = $(libexecsub_LTLIBRARIES) 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 am_liblto_plugin_la_OBJECTS = lto-plugin.lo
liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS) liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS)
liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
...@@ -230,15 +232,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) ...@@ -230,15 +232,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
AM_CFLAGS = -Wall -Werror AM_CFLAGS = -Wall -Werror
libexecsub_LTLIBRARIES = liblto_plugin.la libexecsub_LTLIBRARIES = liblto_plugin.la
liblto_plugin_la_SOURCES = lto-plugin.c 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 = \ 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 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ 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 all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment