Yeah, it also applies to i965.
I'm guessing we haven't seen that problem because expat gets pulled in
by other bits of the mesa.
Looks good to me, thanks :
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
On 17/10/17 02:10, Hongxu Jia wrote:
Linking libvulkan_intel.so can fail, due to unresolved references to
libexpat.so.
EXPAT_CFLAGS should be moved as well.
Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
---
src/intel/Makefile.common.am | 1 +
src/intel/Makefile.tools.am | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 49e9c6a..3789dc1 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -23,6 +23,7 @@ noinst_LTLIBRARIES += common/libintel_common.la
common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
common_libintel_common_la_SOURCES = $(COMMON_FILES)
+common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
if HAVE_PLATFORM_ANDROID
common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
index 8071220..32cdc70 100644
--- a/src/intel/Makefile.tools.am
+++ b/src/intel/Makefile.tools.am
@@ -41,7 +41,6 @@ tools_aubinator_LDADD = \
$(PER_GEN_LIBS) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS) \
- $(EXPAT_LIBS) \
$(ZLIB_LIBS) \
-lm
@@ -56,7 +55,6 @@ tools_aubinator_error_decode_LDADD = \
compiler/libintel_compiler.la \
$(top_builddir)/src/util/libmesautil.la \
$(PTHREAD_LIBS) \
- $(EXPAT_LIBS) \
$(ZLIB_LIBS)
tools_aubinator_error_decode_CFLAGS = \
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
