summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-12-03 21:58:12 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-02-01 15:13:56 +0000
commitf8ed9f24d5eac1549e480dd0348d091b4299302e (patch)
treea2c4a0377ce2827997cc5b1622ba87a7c9485ec2
parent7ad7a07c88b1b1c697132e8f990c0d9530fdf827 (diff)
osx: ld doesn't support --build-id
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-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 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)