Mesa (staging/22.0): meson: add build-id to pipe libraries

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: adab4ef2af5d82738e6157ca79ccc753a5ca7dd6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=adab4ef2af5d82738e6157ca79ccc753a5ca7dd6

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu May  5 12:43:25 2022 +1000

meson: add build-id to pipe libraries

Without this the cache setup was crashing with CL and the dynamic
pipe libraries.

Reported and debugged on irc by consolers

Cc: mesa-stable
Acked-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16341>
(cherry picked from commit 74976640b3803d2ac7dab91e7d57d7b6383e06c4)

---

 .pick_status.json                           | 2 +-
 src/gallium/targets/pipe-loader/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6ad7553f776..9f61694da1c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1460,7 +1460,7 @@
         "description": "meson: add build-id to pipe libraries",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index 1d38c1a5b1b..291c4844906 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-pipe_loader_link_args = [ld_args_gc_sections]
+pipe_loader_link_args = [ld_args_gc_sections, ld_args_build_id]
 pipe_loader_link_deps = []
 pipe_loader_link_with = [libgallium]
 pipe_loader_comp_args = []