Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkit Meel <ankitjmeel@gmail.com>2021-01-29 11:43:26 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2021-01-29 11:43:26 +0300
commit27e2c5ab78317fd79a50980b77fa93af42f2243d (patch)
tree9e4e0afb6a77404c2b33fcb0a304f2f6da8b0709 /GNUmakefile
parent16fab8ebc4c786ce673b7b02e37966a1200f4605 (diff)
Tests, docs: Use sanitizer options from environment too.
Don't overwrite environment variables that may contain options like suppression files, symboliser etc. It's similar to rBa181b156399a13fa429159112e30c8005d5e8a59 and rBA589d13408a60cbec34a8bc3cc798c586043743ae . For Blender Add-ons repo, see the equivalent in D9816. Reviewed By: Blendify Differential Revision: https://developer.blender.org/D9815
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 3b5b9d65521..532f9cb9bde 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -520,7 +520,7 @@ format: .FORCE
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py: .FORCE
- ASAN_OPTIONS=halt_on_error=0 \
+ ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
$(BLENDER_BIN) --background -noaudio --factory-startup \
--python doc/python_api/sphinx_doc_gen.py
sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out