fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 06:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

automake: intel: correctly append to the LIBADD variable

Browse source 
Commit 05fc62d89f 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: 05fc62d89f ("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>
(cherry picked from commit ba414dba4f)
This commit is contained in:
Emil Velikov 2017-10-23 13:29:30 +01:00 • committed by Emil Velikov
parent 2567e1de88
commit 797dbe4efa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/Makefile.common.am
View file

@ -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