Module: Mesa Branch: master Commit: 80bc41b2ec7cf06662e16cbbb610c40a552d66a3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80bc41b2ec7cf06662e16cbbb610c40a552d66a3
Author: Jon Turney <[email protected]> Date: Sun Dec 3 21:58:12 2017 +0000 meson: osx ld doesn't support --build-id Signed-off-by: Jon Turney <[email protected]> Reviewed-by: Dylan Baker <[email protected]> --- meson.build | 4 ++++ src/mesa/drivers/dri/meson.build | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 030ab0c626..b61c285bf0 100644 --- a/meson.build +++ b/meson.build @@ -909,6 +909,10 @@ 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 # check for dl support if cc.has_function('dlopen') diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 87021fba88..6342168ab3 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -53,7 +53,7 @@ if dri_drivers != [] dependencies : [ dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread, dep_dl, idep_nir, ], - 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], ) meson.add_install_script( _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
