diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Makefile.tpl | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d5355c60c59..cb1d51b91b8 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 2733c4dae21..20d1c900794 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 f7bb77e6d67..25673652547 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) |