From d88bf0eb80e2531a8017de4efd4eb02f1e3081ec Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 25 Mar 2019 11:35:18 -0700 Subject: compilers: n_debug=if-release and buildtype=plain should not enable assertions It's a bit odd that it doesn't, and has resulted in bugs in distro packaging. Fixes #5141 --- mesonbuild/compilers/compilers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index da02980..66195dc 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -510,7 +510,7 @@ def get_base_compile_args(options, compiler): try: if (options['b_ndebug'].value == 'true' or (options['b_ndebug'].value == 'if-release' and - options['buildtype'].value == 'release')): + options['buildtype'].value in {'release', 'plain'})): args += ['-DNDEBUG'] except KeyError: pass -- cgit v1.1