summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Seidler <sepek@exherbo.org>2014-01-21 22:44:37 +0100
committerCarl Worth <cworth@cworth.org>2014-02-03 09:59:52 -0800
commitcb7caac0537afbd149d315295b656eb84026708d (patch)
tree07b558485111a653b1d5651596a3a57942a3cee3 /src
parent0461451dcdd640a7eda57f4211e0e03352059d3b (diff)
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@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 1cdeeef6c400979a0497afde52bf351a623a934f)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 884383652d3..dff17b837a6 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