From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 27 Jun 2008 04:41:23 +0000 (+0900)
Subject: scons: Get x86-64<->x86 cross build of assembly files right.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=05cfb4c4b84b4e3119112c381ceffc583a4ef5fe;p=mesa.git

scons: Get x86-64<->x86 cross build of assembly files right.
---

diff --git a/scons/gallium.py b/scons/gallium.py
index 217a1d61d36..c4a5c65be40 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -286,6 +286,13 @@ def generate(env):
 	env.Append(CFLAGS = cflags)
 	env.Append(CXXFLAGS = cflags)
 
+	# Assembler options
+	if gcc:
+		if env['machine'] == 'x86':
+			env.Append(ASFLAGS = ['-m32'])
+		if env['machine'] == 'x86_64':
+			env.Append(ASFLAGS = ['-m64'])
+
 	# Linker options
 	linkflags = []
 	if gcc: