From 9cb5411c1729695a586eaf1d47a42540560387e2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 23 Nov 2012 13:14:05 -0800 Subject: Set gcc_version in tsan/Makefile.am PR sanitizer/55450 * tsan/Makefile.am (gcc_version): New. * tsan/Makefile.in: Regenerated. From-SVN: r193767 --- libsanitizer/tsan/Makefile.am | 3 +++ libsanitizer/tsan/Makefile.in | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'libsanitizer/tsan') diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am index c4fbad9b74d..a3919863ee7 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am @@ -1,5 +1,8 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include +# May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in index b919969cf47..23550e597a8 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in @@ -84,8 +84,7 @@ am__objects_1 = tsan_clock.lo tsan_interface_atomic.lo tsan_mutex.lo \ tsan_rtl.lo tsan_stat.lo tsan_sync.lo tsan_interceptors.lo \ tsan_md5.lo tsan_platform_mac.lo tsan_rtl_mutex.lo \ tsan_suppressions.lo tsan_interface_ann.lo tsan_mman.lo \ - tsan_rtl_report.lo \ - tsan_symbolize_addr2line_linux.lo + tsan_rtl_report.lo tsan_symbolize_addr2line_linux.lo am_libtsan_la_OBJECTS = $(am__objects_1) libtsan_la_OBJECTS = $(am_libtsan_la_OBJECTS) libtsan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -238,6 +237,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include + +# May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros ACLOCAL_AMFLAGS = -I m4 toolexeclib_LTLIBRARIES = libtsan.la -- cgit v1.2.3