Bläddra i källkod

scons: fix llvm detection

The test for env['platform'] caused an exception since 'env' is not
defined at that point.  Instead, determine the target platform by
scanning sys.argv[].
undefined
Brian Paul 16 år sedan
förälder
incheckning
5c682485b8
1 ändrade filer med 11 tillägg och 1 borttagningar
  1. 11
    1
      common.py

+ 11
- 1
common.py Visa fil

@@ -3,6 +3,7 @@

import os
import os.path
import re
import subprocess
import sys
import platform as _platform
@@ -37,9 +38,18 @@ default_machine = _machine_map.get(default_machine, 'generic')
if 'LLVM' in os.environ:
default_llvm = 'yes'
else:
# Search sys.argv[] for a "platform=foo" argument since we don't have
# an 'env' variable at this point.
platform = default_platform
pattern = re.compile("(platform=)(.*)")
for arg in sys.argv:
m = pattern.match(arg)
if m:
platform = m.group(2)

default_llvm = 'no'
try:
if env['platform'] != 'windows' and subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
if platform != 'windows' and subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
default_llvm = 'yes'
except:
pass

Laddar…
Avbryt
Spara