Browse Source

Call MSBuild in x86 build with Win32 platform.

pull/1507/head
Joao Matos 6 years ago
parent
commit
0c2c554cf4
  1. 6
      build/scripts/Build.lua
  2. 6
      build/scripts/LLVM.lua

6
build/scripts/Build.lua

@ -13,7 +13,7 @@ function get_msbuild_path()
error("MSBuild path could not be found in Windows registry.") error("MSBuild path could not be found in Windows registry.")
end end
function msbuild(sln, conf) function msbuild(sln, conf, platform)
local msbuild_path = "msbuild.exe" local msbuild_path = "msbuild.exe"
local sln = path.normalize(sln) local sln = path.normalize(sln)
@ -22,6 +22,10 @@ function msbuild(sln, conf)
cmd = cmd .. " /p:Configuration=" .. conf cmd = cmd .. " /p:Configuration=" .. conf
end end
if platform ~= nil then
cmd = cmd .. " /p:Platform=" .. platform
end
execute_or_die(cmd) execute_or_die(cmd)
end end

6
build/scripts/LLVM.lua

@ -383,7 +383,11 @@ function build_llvm(llvm_build)
local cmake_generator, options = get_cmake_generator() local cmake_generator, options = get_cmake_generator()
cmake(cmake_generator, conf, llvm_build, options) cmake(cmake_generator, conf, llvm_build, options)
local llvm_sln = path.join(llvm_build, "LLVM.sln") local llvm_sln = path.join(llvm_build, "LLVM.sln")
msbuild('"' .. llvm_sln .. '"', conf) platform = nil
if target_architecture() == "x86" then
platform = "Win32"
end
msbuild('"' .. llvm_sln .. '"', conf, platform)
else else
local options = os.ishost("macosx") and local options = os.ishost("macosx") and
"-DLLVM_ENABLE_LIBCXX=true" or "" "-DLLVM_ENABLE_LIBCXX=true" or ""

Loading…
Cancel
Save