From: José Fonseca Date: Fri, 11 Feb 2011 16:29:01 +0000 (+0000) Subject: scons: Fix MSVC 64bit build. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;ds=sidebyside;h=051f8bbfee6618e8bf04712cf214d96cec433e38;p=mesa.git scons: Fix MSVC 64bit build. --- diff --git a/scons/gallium.py b/scons/gallium.py old mode 100644 new mode 100755 index 322b23b2b00..ea09b5d0d69 --- 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']