summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-27 13:41:23 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-27 13:41:23 +0900
commit05cfb4c4b84b4e3119112c381ceffc583a4ef5fe (patch)
tree01bf66529d674762bf7249d941d892f918181427
parent6106db4c5da6fc5ae9ef157c939ce0834cdc5b92 (diff)
scons: Get x86-64<->x86 cross build of assembly files right.
-rw-r--r--scons/gallium.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 217a1d61d3..c4a5c65be4 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: