switch to cmake for llvm

diff --git a/SConstruct b/SConstruct
index dbd62bff7b2839bed42c2abecb64e9f9d4bb1ed6..7b57b7881241296a1d4aa3249c4d32a691004783 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -81,10 +81,10 @@ scheme = base.Clone(CCFLAGS  = [ '-I', 'inc'],
 #------------------------------------------------------------------------------
 import os
 
-llvm = base.Clone()
+llvm = base.Clone(CMAKE_GENERATOR="Unix Makefiles")
 llvm.Command('build/llvm/Makefile',
-             'source/vendor/llvm-3.4.2/configure',
-             'cd ${TARGET.dir} && ../../${SOURCE}')
+             'source/vendor/llvm-3.4.2/',
+             'cd ${TARGET.dir} && cmake -G"${CMAKE_GENERATOR}" ../../${SOURCE}')
 llvm.Command('build/llvm/Release+Assert/bin/llc',
              'build/llvm/Makefile',
              'make -C build/llvm/')