Browse Source

Fixed Ninja build invocations to use the right build directory.

pull/585/head
Joao Matos 10 years ago
parent
commit
5f4c554ea7
  1. 8
      build/scripts/Build.lua
  2. 7
      build/scripts/LLVM.lua

8
build/scripts/Build.lua

@ -25,6 +25,14 @@ function msbuild(sln, conf)
execute(cmd) execute(cmd)
end end
function ninja(dir, action)
local cmd = "ninja -C " .. dir
if action then
cmd = cmd .. " " .. action
end
return execute(cmd)
end
function run_premake(file, action) function run_premake(file, action)
-- search for file with extension Lua -- search for file with extension Lua
if os.isfile(file .. ".lua") then if os.isfile(file .. ".lua") then

7
build/scripts/LLVM.lua

@ -2,7 +2,7 @@ require "Build"
require "Utils" require "Utils"
require "../Helpers" require "../Helpers"
local llvm = basedir .. "/../../deps/llvm" local llvm = basedir .. "/../deps/llvm"
-- If we are inside vagrant then clone and build LLVM outside the shared folder, -- If we are inside vagrant then clone and build LLVM outside the shared folder,
-- otherwise file I/O performance will be terrible. -- otherwise file I/O performance will be terrible.
@ -113,8 +113,8 @@ function build_llvm(llvm_build)
msbuild(llvm_sln, conf) msbuild(llvm_sln, conf)
else else
cmake("Ninja", conf) cmake("Ninja", conf)
execute("ninja") ninja(llvm_build)
execute("ninja clang-headers") ninja(llvm_build, "clang-headers")
end end
end end
@ -189,3 +189,4 @@ if _ACTION == "download_llvm" then
download_llvm() download_llvm()
os.exit() os.exit()
end end

Loading…
Cancel
Save