From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 6 Mar 2010 09:18:15 +0000 (+0000)
Subject: scons: Fix version comparisons.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=19a633310feb3283d979c4ab4cb11a53dcfb6af6;p=mesa.git

scons: Fix version comparisons.
---

diff --git a/scons/llvm.py b/scons/llvm.py
index 88a63854bc6..01eae2403a7 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -76,6 +76,7 @@ def generate(env):
             mo = llvm_version_re.match(line)
             if mo:
                 llvm_version = mo.group(1)
+                llvm_version = distutils.version.LooseVersion(llvm_version)
                 break
         if llvm_version is None:
             print 'scons: could not determine the LLVM version from %s' % llvm_config
@@ -130,6 +131,7 @@ def generate(env):
                 env.Append(LINKFLAGS = ['/nodefaultlib:LIBCMT'])
     elif env.Detect('llvm-config'):
         llvm_version = env.backtick('llvm-config --version').rstrip()
+        llvm_version = distutils.version.LooseVersion(llvm_version)
 
         try:
             env.ParseConfig('llvm-config --cppflags')
@@ -145,7 +147,6 @@ def generate(env):
     assert llvm_version is not None
 
     print 'scons: Found LLVM version %s' % llvm_version
-    llvm_version = distutils.version.LooseVersion(llvm_version)
     env['LLVM_VERSION'] = llvm_version
 
     # Define HAVE_LLVM macro with the major/minor version number (e.g., 0x0206 for 2.6)