From 46f042216584ea65d45a53b08261fbc5498572d5 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 29 Oct 2025 19:09:10 +0100
Subject: [PATCH] util/meson: don't build libmesa_util_clflushopt unless needed

Fixes: 555881e57499bc38f098 ("util/cache_ops: Add some cache flush helpers")
(cherry picked from commit ccf33664e89bec2afb6dd1297ebfee1972d5fb3c)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38268>
---
 .pick_status.json    | 2 +-
 src/util/meson.build | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2a12b360012..c483dce4e3e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -224,7 +224,7 @@
         "description": "util/meson: don't build libmesa_util_clflushopt unless needed",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "555881e57499bc38f098dd5859edecdf6bdad2a2",
         "notes": null
diff --git a/src/util/meson.build b/src/util/meson.build
index b7994b7e544..edb567a822c 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -203,6 +203,7 @@ elif host_machine.cpu_family() in ['x86', 'x86_64'] and cc.get_id() != 'msvc'
       include_directories : [inc_util],
       c_args : [no_override_init_args] + clflushopt_args,
       gnu_symbol_visibility : 'hidden',
+      build_by_default : false,
     )
     libmesa_util_links += [libmesa_util_clflushopt]
   endif