summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Turney <[email protected]>2017-12-03 21:58:12 +0000
committerEmil Velikov <[email protected]>2018-02-05 19:06:02 +0000
commit53f8d524a0ce4ff8ac4ea04306788217c2a99551 (patch)
treefd2c7a278098c7193493f232e5abfd7605eb156e
parenteeee001d784716f25acdb8c3a283164230b1b96c (diff)
osx: ld doesn't support --build-id
Signed-off-by: Jon Turney <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit f8ed9f24d5eac1549e480dd0348d091b4299302e)
-rw-r--r--configure.ac13
-rw-r--r--src/mesa/drivers/dri/Makefile.am2
2 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index daa040d3194..a54b7cb6650 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 ae30996e028..3876d7c4192 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)