Message ID | 52A01AA2.8040201@samsung.com |
---|---|
State | New |
Headers | show |
On Thu, Dec 05, 2013 at 10:18:10AM +0400, Yury Gribov wrote: > This is a fix for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59368 > . It adds a gcc_version variable to libsanitizer's root Makefile. > Tested on x86_64. > > Ok to commit? > 2013-12-05 Yury Gribov <y.gribov@samsung.com> > > PR sanitizer/59368 > * Makefile.am (gcc_version): added gcc_version. Capital letter A here. > * Makefile.in: Regenerate. Ok, thanks. Jakub
>> * Makefile.am (gcc_version): added gcc_version. > Capital letter A here. Thanks, fixed. > Ok Done in r205698. -Y
diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am index 6c3e5b0..dd0fc80 100644 --- a/libsanitizer/Makefile.am +++ b/libsanitizer/Makefile.am @@ -10,6 +10,9 @@ if USING_MAC_INTERPOSE SUBDIRS = sanitizer_common lsan asan ubsan endif +## May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in index 9424c59..d32859e 100644 --- a/libsanitizer/Makefile.in +++ b/libsanitizer/Makefile.in @@ -240,6 +240,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config @TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common lsan asan ubsan @TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common lsan asan tsan ubsan @USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common lsan asan ubsan +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and