From: miyuki <miyuki@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 24 Jan 2016 15:32:17 +0000 (+0000)
Subject: Pass LSAN_OPTIONS to Makefiles in subdirectories
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdcc70f18b67faf74da869bea0c625813ed0c855;p=thirdparty%2Fgcc.git

Pass LSAN_OPTIONS to Makefiles in subdirectories

	PR bootstrap/69329
	* Makefile.tpl (BASE_FLAGS_TO_PASS): Add LSAN_OPTIONS.
	* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232777 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/ChangeLog b/ChangeLog
index d5355c60c596..cb1d51b91b8c 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 2733c4dae21e..20d1c9007947 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 f7bb77e6d673..25673652547f 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)