4 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 95c637d0cdd..5cb2127501e 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -57,6 +57,7 @@ mesa_dri_drivers_la_LDFLAGS = \
 	-module \
 	-no-undefined \
 	-avoid-version \
+	-Wl,--build-id=sha1 \
 	$(BSYMBOLIC) \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)
diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 62d388e08df..b1054aa6e28 100644
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -27,6 +27,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := i915_dri
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 # Import variables i915_FILES.
 include $(LOCAL_PATH)/Makefile.sources
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index d75ffb13813..39aa33fa9f6 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -247,6 +247,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := i965_dri
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 LOCAL_CFLAGS := \
 	$(MESA_DRI_CFLAGS)
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index ee1a1d95a64..a2fc8db8ada 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -50,7 +50,7 @@ if dri_drivers != []
                  libmesa_util, libnir, libmesa_classic],
     dependencies : [dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread,
                     dep_dl],
-    link_args : [ld_args_bsymbolic, ld_args_gc_sections],
+    link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
   )
 
   pkg.generate(