From 0fe87ec7a02db4c26858131d34d3b92a04aec9d3 Mon Sep 17 00:00:00 2001 From: Paul Seidler Date: Tue, 21 Jan 2014 22:44:37 +0100 Subject: [PATCH] build: move ARCH_LIBS definition outside of ASM definition mesa_streaming_load_memcpy is also needed even if assembling is disabled --- 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 -- 1.8.5.3