From: Nico Weber Date: Sat, 12 Jan 2019 11:56:47 +0000 (+0000) Subject: gn build: Unbreak Windows build X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=516944648c00dde41dede8e22072578a2e7e1980;p=llvm gn build: Unbreak Windows build I didn't break all that much during upstreaming, just needs two small fixes: - fix spelling of MCJITTests.def file - make libLTO a shared_library to put it in bin/ on Windows where it is in the CMake build too Differential Revision: https://reviews.llvm.org/D56630 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351004 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/utils/gn/secondary/llvm/tools/lto/BUILD.gn b/utils/gn/secondary/llvm/tools/lto/BUILD.gn index dfd33292b71..3cc62d3888f 100644 --- a/utils/gn/secondary/llvm/tools/lto/BUILD.gn +++ b/utils/gn/secondary/llvm/tools/lto/BUILD.gn @@ -1,6 +1,6 @@ import("//llvm/version.gni") -lto_target_type = "loadable_module" +lto_target_type = "shared_library" if (host_os == "linux") { # Linux needs -fPIC to build shared libs but they aren't on by default. # For now, make libclang a static lib there. @@ -8,7 +8,7 @@ if (host_os == "linux") { } target(lto_target_type, "lto") { - output_name = "libLTO" + output_name = "LTO" deps = [ "//llvm/lib/Bitcode/Reader", "//llvm/lib/IR", diff --git a/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn b/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn index e6261f61d4e..eed7d734eb7 100644 --- a/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn +++ b/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn @@ -24,6 +24,6 @@ unittest("MCJITTests") { ] if (host_os == "win") { - sources += [ "MCJITTest.def" ] + sources += [ "MCJITTests.def" ] } }