diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-10-29 12:37:18 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-10-29 12:37:18 +0100 |
| commit | 56f274b2d9cc87e63974a26f5c0685f506ad93d4 (patch) | |
| tree | 6c7aa8f0b6b1fbc2fc8d9343dc5033d1ac6be855 /libcc1/Makefile.am | |
| parent | a3cdf7c0cadca64ff0efa9c56ff1ed50fee70575 (diff) | |
| download | gcc-56f274b2d9cc87e63974a26f5c0685f506ad93d4.tar.gz | |
Makefile.am (CXXFLAGS, LDFLAGS): Filter out -fsanitize=address.
* Makefile.am (CXXFLAGS, LDFLAGS): Filter out -fsanitize=address.
(libiberty_normal, libiberty_noasan, libiberty_pic, libiberty_dep):
New variables.
(libiberty): Set to -Wc, followed by the first existing noasan/,
pic/ or . libiberty.a.
(libcc1plugin_la_DEPENDENCIES, libcc1plugin_la_LINK,
libcc1_la_DEPENDENCIES, libcc1_la_LINK, LTLDFLAGS): New variables.
* Makefile.in: Regenerated.
From-SVN: r216832
Diffstat (limited to 'libcc1/Makefile.am')
| -rw-r--r-- | libcc1/Makefile.am | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am index b3040c54bc4..899a7df43f6 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am @@ -24,8 +24,17 @@ AM_CPPFLAGS = -I $(srcdir)/../include -I $(srcdir)/../libgcc \ -I $(srcdir)/../libcpp/include WERROR_FLAG = -Werror AM_CXXFLAGS = $(WARN_FLAGS) $(WERROR_FLAG) $(visibility) -libiberty = ../libiberty/pic/libiberty.a - +override CXXFLAGS := $(filter-out -fsanitize=address,$(CXXFLAGS)) +override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS)) +# Can be simplified when libiberty becomes a normal convenience library. +libiberty_normal = ../libiberty/libiberty.a +libiberty_noasan = ../libiberty/noasan/libiberty.a +libiberty_pic = ../libiberty/pic/libiberty.a +Wc=-Wc, +libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ + $(if $(wildcard $(libiberty_pic)),$(Wc)$(libiberty_pic), \ + $(Wc)$(libiberty_normal))) +libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin cc1libdir = $(libdir)/$(libsuffix) @@ -49,7 +58,16 @@ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym libcc1plugin_la_SOURCES = plugin.cc $(shared_source) libcc1plugin_la_LIBADD = $(libiberty) +libcc1plugin_la_DEPENDENCIES = $(libiberty_dep) +libcc1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libcc1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym libcc1_la_SOURCES = findcomp.cc libcc1.cc names.cc names.hh $(shared_source) libcc1_la_LIBADD = $(libiberty) +libcc1_la_DEPENDENCIES = $(libiberty_dep) +libcc1_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libcc1_la_LDFLAGS) $(LTLDFLAGS) -o $@ |