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

diff --git a/scons/gallium.py b/scons/gallium.py
index 217a1d61d360cf0ce7a47ba0c19b4cf22942bde2..c4a5c65be4013ded2f210356f520ee5f1ad47e4a 100644 (file)
--- 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: