Mesa (master): automake: intel: correctly append to the LIBADD variable
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Nov 8 16:01:21 UTC 2017
Module: Mesa
Branch: master
Commit: ba414dba4f1bf354cc9494fd76e3e28b489f13a1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba414dba4f1bf354cc9494fd76e3e28b489f13a1
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Mon Oct 23 13:29:30 2017 +0100
automake: intel: correctly append to the LIBADD variable
Commit 05fc62d89f5 sets the variable, yet it forgot the update the
existing reference to append (instead of assign).
Thus as-is the expat library was discarded from the link chain when
building with Android.
Fixes: 05fc62d89f5 ("automake: intel: move expat handling where it's
used")
Cc: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
src/intel/Makefile.common.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 894dbb5208..443cefc522 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -27,5 +27,5 @@ common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
if HAVE_PLATFORM_ANDROID
common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
-common_libintel_common_la_LIBADD = $(ANDROID_LIBS)
+common_libintel_common_la_LIBADD += $(ANDROID_LIBS)
endif
More information about the mesa-commit
mailing list