[llvm] r351004 - gn build: Unbreak Windows build

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Sat Jan 12 03:56:48 PST 2019


Author: nico
Date: Sat Jan 12 03:56:47 2019
New Revision: 351004

URL: http://llvm.org/viewvc/llvm-project?rev=351004&view=rev
Log:
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

Modified:
    llvm/trunk/utils/gn/secondary/llvm/tools/lto/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/lto/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/lto/BUILD.gn?rev=351004&r1=351003&r2=351004&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/lto/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/lto/BUILD.gn Sat Jan 12 03:56:47 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn?rev=351004&r1=351003&r2=351004&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn Sat Jan 12 03:56:47 2019
@@ -24,6 +24,6 @@ unittest("MCJITTests") {
   ]
 
   if (host_os == "win") {
-    sources += [ "MCJITTest.def" ]
+    sources += [ "MCJITTests.def" ]
   }
 }




More information about the llvm-commits mailing list