Revert "scons: Refuse to use LLVM 2.7 for now."
This reverts commit 44703217f7
.
http://www.llvm.org/bugs/show_bug.cgi?id=6429 has been fixed now. Things
appear to be working reasonably so far.
This commit is contained in:
@@ -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')
|
||||
|
Reference in New Issue
Block a user