summaryrefslogtreecommitdiff
path: root/libsanitizer
diff options
context:
space:
mode:
Diffstat (limited to 'libsanitizer')
-rw-r--r--libsanitizer/ChangeLog6
-rw-r--r--libsanitizer/Makefile.am3
-rw-r--r--libsanitizer/Makefile.in1
3 files changed, 10 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 661c326de73..0c4c61feb0c 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-05 Yury Gribov <y.gribov@samsung.com>
+
+ PR sanitizer/59368
+ * Makefile.am (gcc_version): Added gcc_version.
+ * Makefile.in: Regenerate.
+
2013-12-05 Kostya Serebryany <kcc@google.com>
* All source files: Merge from upstream r196090.
diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am
index 6c3e5b053a2..dd0fc80da8b 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 9424c59fe37..d32859e77a7 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