X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2Fmeson.build;h=34a43e33f095ebf46ebd59613f683d7fb23c5ad6;hb=57fba85da408dd4ec98508b5106c156d616b5602;hp=00ba1491c45da0b1c1befd64c686ae7c3102d4c9;hpb=71ca5fb68ad2e8c0ac7e4fbbd1eb56b0e3cd8732;p=mesa.git

diff --git a/src/loader/meson.build b/src/loader/meson.build
index 00ba1491c45..34a43e33f09 100644
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -24,10 +24,11 @@ if with_platform_x11 and with_dri3
   libloader_dri3_helper = static_library(
     'loader_dri3_helper',
     'loader_dri3_helper.c',
-    c_args : c_vis_args,
+    gnu_symbol_visibility : 'hidden',
     include_directories : [inc_include, inc_src],
     dependencies : [
       dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
+      dep_xcb_xfixes,
     ],
     build_by_default : false,
   )
@@ -35,13 +36,21 @@ else
   libloader_dri3_helper = []
 endif
 
+loader_c_args = [
+  '-DUSE_DRICONF',
+  '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
+]
+
+if with_gallium_iris and get_option('prefer-iris')
+  loader_c_args += ['-DPREFER_IRIS']
+endif
+
 libloader = static_library(
   'loader',
   ['loader.c', 'pci_id_driver_map.c'],
-  c_args : [c_vis_args, '-DUSE_DRICONF',
-            '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
-],
+  c_args : loader_c_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_include, inc_src, inc_util],
-  dependencies : [dep_libdrm, dep_thread, idep_xmlconfig_headers],
+  dependencies : [dep_libdrm, dep_thread],
   build_by_default : false,
 )