Mesa (staging/19.0): isl: fix automake build when sse41 is not supported

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: f028945c01470a8d69c469a00c76429c7611d55f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f028945c01470a8d69c469a00c76429c7611d55f

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Mar 15 12:32:09 2019 +0200

isl: fix automake build when sse41 is not supported

Fixes: 864cc419eb0a41882762 "intel/isl: move tiled_memcpy static libs from i965 to isl"
Cc: mesa-stable at lists.freedesktop.org
Reported-by: Milav Soni <milav.soni at teqdiligent.com>
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit a1cd0040b6d1ae3dbf9d792c5ab1aadbbf917bac)

---

 src/intel/Makefile.isl.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am
index a6733f3ba8e..dcb9d3ad6fc 100644
--- a/src/intel/Makefile.isl.am
+++ b/src/intel/Makefile.isl.am
@@ -33,12 +33,15 @@ ISL_GEN_LIBS =                                           \
 
 noinst_LTLIBRARIES += $(ISL_GEN_LIBS) \
                       isl/libisl.la \
-                      libisl_tiled_memcpy.la \
-                      libisl_tiled_memcpy_sse41.la
+                      libisl_tiled_memcpy.la
 
 isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) \
-                       libisl_tiled_memcpy.la \
-                       libisl_tiled_memcpy_sse41.la
+                       libisl_tiled_memcpy.la
+
+if SSE41_SUPPORTED
+isl_libisl_la_LIBADD += libisl_tiled_memcpy_sse41.la
+noinst_LTLIBRARIES += libisl_tiled_memcpy_sse41.la
+endif
 
 isl_libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES)