summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-03-20 09:41:52 -0600
committerBrian Paul <brianp@vmware.com>2013-03-21 09:24:40 -0600
commit3804d677238b9865f90d1dea14567807a986bfac (patch)
tree34e97ae12006dd9366d828a0ba6822bb66e7afc1
parent10393038f8d8279aca53df020c608f205e624043 (diff)
scons: check for existance of 'MSVC_VERSION' in env
Evidently, MSVC_VERSION isn't always defined so check for it before checking the MSVC version. Suggested by Jose.
-rwxr-xr-xscons/gallium.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index b28be5d8961..57b5b418f98 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -402,7 +402,7 @@ def generate(env):
'/Oi', # enable intrinsic functions
]
else:
- if distutils.version.LooseVersion(env['MSVC_VERSION']) < distutils.version.LooseVersion('11.0'):
+ if 'MSVC_VERSION' in env and distutils.version.LooseVersion(env['MSVC_VERSION']) < distutils.version.LooseVersion('11.0'):
print 'scons: warning: Visual Studio versions prior to 2012 are known to produce incorrect code when optimizations are enabled ( https://bugs.freedesktop.org/show_bug.cgi?id=58718 )'
ccflags += [
'/O2', # optimize for speed