[pacman-dev] [PATCH 1/2] meson: use better check for debug builds
meson 0.48 added the 'debug' and 'optimization' builtin options, which bidirectionally map to the buildtype, but in some cases where debug is enabled, the builtype may be custom. Checking the 'debug' option lets us detect every case currently detected, plus a few more, and does so in a shorter and more concise manner. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 572526b2..680cf62b 100644 --- a/meson.build +++ b/meson.build @@ -177,7 +177,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype').startswith('debug') +if get_option('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.26.2
meson.build gets two-space indents, but our global tabbed default was overriding this. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index efea87bf..220ffbc8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,5 +16,9 @@ indent_style = tab [{NEWS,HACKING}] indent_style = space +[meson.build] +indent_style = space +indent_size = 2 + [*.py] indent_style = space -- 2.26.2
On 5/5/20 2:41 pm, Eli Schwartz wrote:
meson.build gets two-space indents, but our global tabbed default was overriding this.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/.editorconfig b/.editorconfig index efea87bf..220ffbc8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,5 +16,9 @@ indent_style = tab [{NEWS,HACKING}] indent_style = space
+[meson.build] +indent_style = space +indent_size = 2 + [*.py] indent_style = space
OK.
On 5/5/20 2:41 pm, Eli Schwartz wrote:
meson 0.48 added the 'debug' and 'optimization' builtin options, which bidirectionally map to the buildtype, but in some cases where debug is enabled, the builtype may be custom. Checking the 'debug' option lets us detect every case currently detected, plus a few more, and does so in a shorter and more concise manner.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> ---
OK.
participants (2)
-
Allan McRae
-
Eli Schwartz