diff mbox

[libdrm,01/23] meson: don't enable libdrm_intel without atomic support

Message ID 20180320174659.1510-2-eric.engestrom@imgtec.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Engestrom March 20, 2018, 5:46 p.m. UTC 
In the 'auto' case, the `with_atomic` check was bypassed.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
---
 meson.build | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/meson.build b/meson.build
index 961ee59cff6dc3c2cbb9..e762dcc44bff5deac4d1 100644
--- a/meson.build
+++ b/meson.build
@@ -71,12 +71,13 @@  config.set10('HAVE_LIB_ATOMIC_OPS', lib_atomics)
 
 with_intel = false
 _intel = get_option('intel')
-if _intel != 'false'
-  if _intel == 'true' and not with_atomics
-    error('libdrm_intel requires atomics.')
-  else
-    with_intel = _intel == 'true' or host_machine.cpu_family().startswith('x86')
-  endif
+if _intel == 'auto'
+  with_intel = with_atomics and host_machine.cpu_family().startswith('x86')
+else
+  with_intel = _intel == 'true'
+endif
+if with_intel and not with_atomics
+  error('libdrm_intel requires atomics.')
 endif
 
 with_radeon = false