From a2da9444015fa367dc4d81b0514410f01b58be46 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Wed, 2 Dec 2015 13:07:50 -0500 Subject: [PATCH] Fixed OSX CMake configuration in LLVM build scripts. --- build/scripts/LLVM.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/scripts/LLVM.lua b/build/scripts/LLVM.lua index e5aa26a6..ba3700aa 100644 --- a/build/scripts/LLVM.lua +++ b/build/scripts/LLVM.lua @@ -86,7 +86,7 @@ function download_llvm() end end -function cmake(gen, conf) +function cmake(gen, conf, options) local cwd = os.getcwd() os.chdir(llvm_build) local cmd = "cmake -G " .. '"' .. gen .. '"' @@ -95,6 +95,7 @@ function cmake(gen, conf) .. ' -DLLVM_INCLUDE_EXAMPLES=false -DLLVM_INCLUDE_DOCS=false -DLLVM_INCLUDE_TESTS=false' .. ' -DLLVM_TARGETS_TO_BUILD="X86"' .. ' -DCMAKE_BUILD_TYPE=' .. conf .. ' ..' + .. ' ' .. options execute(cmd) os.chdir(cwd) end @@ -112,7 +113,9 @@ function build_llvm(llvm_build) local llvm_sln = path.join(llvm_build, "LLVM.sln") msbuild(llvm_sln, conf) else - cmake("Ninja", conf) + local options = os.is("macosx") and + "-DLLVM_ENABLE_LIBCXX=true -DLLVM_BUILD_32_BITS=true" or "" + cmake("Ninja", conf, options) ninja(llvm_build) ninja(llvm_build, "clang-headers") end