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

diff --git a/ChangeLog b/ChangeLog
index d5355c60c5963a2b32a9ecc85a898da87e351bb9..cb1d51b91b8cf5c2caefef0ae8105bc75247613b 100644 (file)
--- 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 2733c4dae21ecc176a41a796fc23e45e77ac0805..20d1c90079472a24aa3cd3076c05ed77f252af2c 100644 (file)
--- 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 f7bb77e6d673b780b13970858076c69447e4eca6..25673652547f14f188713b331ed1a0d36ffd6907 100644 (file)
--- 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)