diff options
| author | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /scons/llvm.py | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'scons/llvm.py')
| -rw-r--r-- | scons/llvm.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index c8e50c5916d..01eae2403a7 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -82,11 +82,6 @@ def generate(env): print 'scons: could not determine the LLVM version from %s' % llvm_config return - if llvm_version >= distutils.version.LooseVersion('2.7'): - print 'scons: Ignoring unsupported LLVM version %s' % llvm_version - print 'scons: See http://www.llvm.org/bugs/show_bug.cgi?id=6429' - return - env.Prepend(CPPPATH = [os.path.join(llvm_dir, 'include')]) env.AppendUnique(CPPDEFINES = [ '__STDC_LIMIT_MACROS', @@ -138,11 +133,6 @@ def generate(env): llvm_version = env.backtick('llvm-config --version').rstrip() llvm_version = distutils.version.LooseVersion(llvm_version) - if llvm_version >= distutils.version.LooseVersion('2.7'): - print 'scons: Ignoring unsupported LLVM version %s' % llvm_version - print 'scons: See http://www.llvm.org/bugs/show_bug.cgi?id=6429' - return - try: env.ParseConfig('llvm-config --cppflags') env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter') |