Mesa (master): build: move ARCH_LIBS definition outside of ASM definition

Matt Turner mattst88 at kemper.freedesktop.org
Sat Feb 1 23:02:54 UTC 2014


Module: Mesa
Branch: master
Commit: 1cdeeef6c400979a0497afde52bf351a623a934f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1cdeeef6c400979a0497afde52bf351a623a934f

Author: Paul Seidler <sepek at exherbo.org>
Date:   Tue Jan 21 22:44:37 2014 +0100

build: move ARCH_LIBS definition outside of ASM definition

_mesa_streaming_load_memcpy is also needed even if assembling is disabled

Cc: "10.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/Makefile.am |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index cb038a5..ffe6599 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -95,6 +95,12 @@ AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
 
+ARCH_LIBS =
+
+if SSE41_SUPPORTED
+ARCH_LIBS += libmesa_sse41.la
+endif
+
 MESA_ASM_FILES_FOR_ARCH =
 
 if HAVE_X86_ASM
@@ -103,12 +109,6 @@ noinst_PROGRAMS = gen_matypes
 gen_matypes_SOURCES = x86/gen_matypes.c
 BUILT_SOURCES += matypes.h
 
-ARCH_LIBS =
-
-if SSE41_SUPPORTED
-ARCH_LIBS += libmesa_sse41.la
-endif
-
 if HAVE_X86_64_ASM
 MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
 AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64




More information about the mesa-commit mailing list