nir: initialize uses_discard to false

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 9fe017d54555a3722eeb5b257ed03b4064d0e6aa..bce17a7cdc2ab6af19fd4b96fe528fb789c12264 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1123,10 +1123,8 @@ if cc.links('int main() { return 0; }',
             name : 'dynamic-list')
   with_ld_dynamic_list = true
 endif
-ld_args_build_id = []
-if build_machine.system() != 'darwin'
-   ld_args_build_id += '-Wl,--build-id=sha1'
-endif
+
+ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1')
 
 # check for dl support
 dep_dl = null_dep
@@ -1445,7 +1443,7 @@ if with_platform_x11
         with_gallium_omx != 'disabled'))
     dep_xcb = dependency('xcb')
     dep_x11_xcb = dependency('x11-xcb')
-    if not dep_libdrm.found()
+    if with_dri_platform == 'drm' and not dep_libdrm.found()
       error('libdrm required for gallium video statetrackers when using x11')
     endif
   endif