On Monday, 2017-10-23 13:29:30 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> 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....@windriver.com>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Eric Engestrom <eric.engest...@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 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
> --
> 2.14.1
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
