summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan.c.baker@intel.com>2020-09-22 09:02:46 -0700
committerEric Engestrom <eric@engestrom.ch>2020-09-27 11:13:04 +0200
commit80c6955c23bea29fbd4279220e7a37ab0ae35888 (patch)
treee5ecac561cc17b55bf2ed712738f02d149620015
parent02f2b9fa7b63e1ec3a5f026cfe968c5f61586ff3 (diff)
meson/anv: Use variable that checks for --build-id
fixes: d1992255bb29054fa51763376d125183a9f602f3 ("meson: Add build Intel "anv" vulkan driver") Acked-by: Jason Ekstrand <jason@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6819> (cherry picked from commit 465460943a2bf049e83a602d70f921775245dbca)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/vulkan/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 0f642d3823b..3fcbabe8d55 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
"description": "meson/anv: Use variable that checks for --build-id",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "d1992255bb29054fa51763376d125183a9f602f3"
},
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 5884ac05647..7c18006618b 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -203,7 +203,7 @@ libvulkan_intel = shared_library(
idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, idep_xmlconfig,
],
c_args : anv_flags,
- link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],
install : true,
)