Mesa (master): osx: ld doesn't support --build-id
Jon TURNEY
jturney at kemper.freedesktop.org
Thu Feb 1 15:15:23 UTC 2018
Module: Mesa
Branch: master
Commit: f8ed9f24d5eac1549e480dd0348d091b4299302e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8ed9f24d5eac1549e480dd0348d091b4299302e
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date: Sun Dec 3 21:58:12 2017 +0000
osx: ld doesn't support --build-id
Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
configure.ac | 13 +++++++++++++
src/mesa/drivers/dri/Makefile.am | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index daa040d319..a54b7cb665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,6 +686,19 @@ LDFLAGS=$save_LDFLAGS
AM_CONDITIONAL(HAVE_LD_DYNAMIC_LIST, test "$have_ld_dynamic_list" = "yes")
dnl
+dnl OSX linker does not support build-id
+dnl
+case "$host_os" in
+darwin*)
+ LD_BUILD_ID=""
+ ;;
+*)
+ LD_BUILD_ID="-Wl,--build-id=sha1"
+ ;;
+esac
+AC_SUBST([LD_BUILD_ID])
+
+dnl
dnl compatibility symlinks
dnl
case "$host_os" in
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index ae30996e02..3876d7c419 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -57,7 +57,7 @@ mesa_dri_drivers_la_LDFLAGS = \
-module \
-no-undefined \
-avoid-version \
- -Wl,--build-id=sha1 \
+ $(LD_BUILD_ID) \
$(BSYMBOLIC) \
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
More information about the mesa-commit
mailing list