Message ID | 20180404153818.26179-4-eric.engestrom@imgtec.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/meson.build b/meson.build index 4bc088bacdd8120c1508..edcc7e8ddc39b1760868 100644 --- a/meson.build +++ b/meson.build @@ -104,11 +104,13 @@ endif with_nouveau = false _nouveau = get_option('nouveau') -if _nouveau != 'false' - if _nouveau == 'true' and not with_atomics - error('libdrm_nouveau requires atomics.') - endif - with_nouveau = true +if _nouveau == 'auto' + with_nouveau = with_atomics +else + with_nouveau = _nouveau == 'true' +endif +if with_nouveau and not with_atomics + error('libdrm_nouveau requires atomics.') endif with_vmwgfx = false
In the 'auto' case, the `with_atomic` check was bypassed. Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> --- meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)