diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-10-23 13:29:30 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-11-13 17:17:15 +0000 |
| commit | 797dbe4efa59dbac9a5d4fd950b596ef8cb3f222 (patch) | |
| tree | 3b30f67e1c1f30e3479762c73771fd2e2aa5b921 | |
| parent | 2567e1de88e2989f4ae089eb534131ced589068c (diff) | |
| download | mesa-797dbe4efa59dbac9a5d4fd950b596ef8cb3f222.tar.gz | |
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>
(cherry picked from commit ba414dba4f1bf354cc9494fd76e3e28b489f13a1)
| -rw-r--r-- | src/intel/Makefile.common.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 |