From: Michael D. Lowis Date: Tue, 24 Jun 2014 02:33:24 +0000 (-0400) Subject: switch to cmake for llvm X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=8f043e8b08348d805b1b1e3cbdad10df8e073022;p=proto%2Fsclpl.git switch to cmake for llvm --- diff --git a/SConstruct b/SConstruct index dbd62bf..7b57b78 100644 --- 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/')