diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
| commit | 9f273f109875cd9208d4c1c8f5939fb5e507c230 (patch) | |
| tree | 35c8adedcf44cf8eb3bddbb51b5efa766539a07b /scons | |
| parent | fab99092a0879531442d1dd20f971ae7eda824eb (diff) | |
| parent | aad0deee4b2d347bdfc536fe98938ed825bf0f6b (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/gallium.py | 1 | ||||
| -rw-r--r-- | scons/llvm.py | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index bf6172b4d7..47b07744be 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -340,6 +340,7 @@ def generate(env): '-m32', #'-march=pentium4', '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics + '-mstackrealign', # ensure stack is aligned -- do not enabled -msse without it! #'-mfpmath=sse', ] if env['machine'] == 'x86_64': diff --git a/scons/llvm.py b/scons/llvm.py index 702f1e354f..46a8d829ca 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -56,15 +56,17 @@ def generate(env): env.PrependENVPath('PATH', llvm_bin_dir) if env.Detect('llvm-config'): - try: - env['LLVM_VERSION'] = env.backtick('llvm-config --version') - except AttributeError: - env['LLVM_VERSION'] = 'X.X' + version = env.backtick('llvm-config --version').rstrip() - env.ParseConfig('llvm-config --cppflags') - env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter') - env.ParseConfig('llvm-config --ldflags') - env['LINK'] = env['CXX'] + try: + env.ParseConfig('llvm-config --cppflags') + env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter') + env.ParseConfig('llvm-config --ldflags') + except OSError: + print 'llvm-config version %s failed' % version + else: + env['LINK'] = env['CXX'] + env['LLVM_VERSION'] = version def exists(env): return True |