diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-04-17 14:25:25 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-04-17 14:25:25 +0200 |
| commit | 4f148bbc73f5aeb52aec38785263c26811be308d (patch) | |
| tree | 47cfcc6b2ff22d34b1cb69c133eaa143f2c4117d /lto-plugin/Makefile.in | |
| parent | ffe7f7a75f2e5709f2678d01bf1a92890304c346 (diff) | |
re PR sanitizer/56781 (boostrap-asan failure: fixincl fails to link (missing -lasan))
PR sanitizer/56781
lto-plugin/
* Makefile.am (CFLAGS, LDFLAGS): Filter out -fsanitize=address.
(liblto_plugin_la_LIBADD, liblto_plugin_la_LDFLAGS,
liblto_plugin_la_DEPENDENCIES): Prefer ../libiberty/noasan/libiberty.a
over ../libiberty/pic/libiberty.a if the former exists.
* Makefile.in: Regenerated.
libiberty/
* maint-tool: Also emit rule for noasan/ subdirectory.
* configure.ac (NOASANFLAG): Set and substitute.
* Makefile.in: Regenerated.
(NOASANFLAG): Set.
(all, $(TARGETLIB), mostlyclean): Handle noasan subdir like pic
subdir.
(stamp-noasandir): New goal.
* configure: Regenerated.
From-SVN: r209476
Diffstat (limited to 'lto-plugin/Makefile.in')
| -rw-r--r-- | lto-plugin/Makefile.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 3739866d7a1..6e2fcc62a73 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -239,15 +239,18 @@ Wc = -Wc, LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) liblto_plugin_la_SOURCES = lto-plugin.c liblto_plugin_la_LIBADD = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,) + $(if $(wildcard ../libiberty/noasan/libiberty.a),$(Wc)../libiberty/noasan/libiberty.a, \ + $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)) # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) \ $(lt_host_flags) -module -bindir $(libexecsubdir) \ - $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a) + $(if $(wildcard ../libiberty/noasan/libiberty.a),, \ + $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)) liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ - ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) + ../libiberty/noasan/libiberty.a),../libiberty/noasan/libiberty.a, \ + $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)) liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -539,6 +542,8 @@ uninstall-am: uninstall-libexecsubLTLIBRARIES pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-libexecsubLTLIBRARIES +override CFLAGS := $(filter-out -fsanitize=address,$(CFLAGS)) +override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS)) all-local: $(in_gcc_libs) |