Mesa (master): scons: Fix MSVC 64bit build.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri Feb 11 20:09:56 UTC 2011
Module: Mesa
Branch: master
Commit: 051f8bbfee6618e8bf04712cf214d96cec433e38
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=051f8bbfee6618e8bf04712cf214d96cec433e38
Author: José Fonseca <jfonseca at vmware.com>
Date: Fri Feb 11 16:29:01 2011 +0000
scons: Fix MSVC 64bit build.
---
scons/gallium.py | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
old mode 100644
new mode 100755
index 322b23b..ea09b5d
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -141,6 +141,10 @@ def pkg_config_modules(env, name, modules):
def generate(env):
"""Common environment generation code"""
+ # Tell tools which machine to compile for
+ env['TARGET_ARCH'] = env['machine']
+ env['MSVS_ARCH'] = env['machine']
+
# Toolchain
platform = env['platform']
if env['toolchain'] == 'default':
@@ -175,6 +179,10 @@ def generate(env):
env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
env['msvc'] = env['CC'] == 'cl'
+ if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64':
+ # MSVC x64 support is broken in earlier versions of scons
+ env.EnsurePythonVersion(2, 0)
+
# shortcuts
machine = env['machine']
platform = env['platform']
More information about the mesa-commit
mailing list