aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Maltsev <maltsevm@gmail.com>2016-01-24 15:32:17 +0000
committerMikhail Maltsev <miyuki@gcc.gnu.org>2016-01-24 15:32:17 +0000
commitcefadad11a92850cd46a38177ad3731d6dad3ad6 (patch)
tree2407875b7e219a1ea0699244049f9a8420addddf
parente9fe2963a9ef03565151edb49080b730d11aa8d6 (diff)
downloadgcc-cefadad11a92850cd46a38177ad3731d6dad3ad6.zip
gcc-cefadad11a92850cd46a38177ad3731d6dad3ad6.tar.gz
gcc-cefadad11a92850cd46a38177ad3731d6dad3ad6.tar.bz2
Pass LSAN_OPTIONS to Makefiles in subdirectories
PR bootstrap/69329 * Makefile.tpl (BASE_FLAGS_TO_PASS): Add LSAN_OPTIONS. * Makefile.in: Regenerate. From-SVN: r232777
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in3
-rw-r--r--Makefile.tpl3
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d5355c6..cb1d51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-24 Mikhail Maltsev <maltsevm@gmail.com>
+
+ PR bootstrap/69329
+ * Makefile.tpl (BASE_FLAGS_TO_PASS): Add LSAN_OPTIONS.
+ * Makefile.in: Regenerate.
+
2016-01-12 Andris Pavenis <andris.pavenis@iki.fi>
* configure.ac: Enable LTO for DJGPP
diff --git a/Makefile.in b/Makefile.in
index 2733c4d..20d1c90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -789,7 +789,8 @@ BASE_FLAGS_TO_PASS = \
$(CXX_FOR_TARGET_FLAG_TO_PASS) \
"TFLAGS=$(TFLAGS)" \
"CONFIG_SHELL=$(SHELL)" \
- "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
+ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+ $(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
# We leave this in just in case, but it is not needed anymore.
RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
diff --git a/Makefile.tpl b/Makefile.tpl
index f7bb77e..2567365 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -590,7 +590,8 @@ BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
$(CXX_FOR_TARGET_FLAG_TO_PASS) \
"TFLAGS=$(TFLAGS)" \
"CONFIG_SHELL=$(SHELL)" \
- "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
+ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+ $(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
# We leave this in just in case, but it is not needed anymore.
RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)