From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 23 Oct 2017 12:29:30 +0000 (+0100)
Subject: automake: intel: correctly append to the LIBADD variable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba414dba4f1bf354cc9494fd76e3e28b489f13a1;p=mesa.git

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@windriver.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 894dbb5208c..443cefc522a 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