[llvm] 48cc5b0 - [gn build] (manually) port ca6751043d88

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-04-16T18:03:44-04:00
New Revision: 48cc5b0d35fe5d5bd7a9427dd6af2c0d59bd5ce2

URL: https://github.com/llvm/llvm-project/commit/48cc5b0d35fe5d5bd7a9427dd6af2c0d59bd5ce2
DIFF: https://github.com/llvm/llvm-project/commit/48cc5b0d35fe5d5bd7a9427dd6af2c0d59bd5ce2.diff

LOG: [gn build] (manually) port ca6751043d88

Added: 
    

Modified: 
    llvm/utils/gn/secondary/lld/test/BUILD.gn
    llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index 9344f7e4c04fd..845d425b2d5f8 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -1,5 +1,6 @@
 import("//llvm/lib/DebugInfo/PDB/enable_dia.gni")
 import("//llvm/triples.gni")
+import("//llvm/utils/gn/build/libs/xar/enable.gni")
 import("//llvm/utils/gn/build/libs/xml/enable.gni")
 import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
@@ -51,6 +52,12 @@ write_lit_cfg("lit_site_cfg") {
     extra_values += [ "LLVM_ENABLE_DIA_SDK=0" ]  # Must be 0.
   }
 
+  if (llvm_enable_libxar) {
+    extra_values += [ "HAVE_LIBXAR=1" ]
+  } else {
+    extra_values += [ "HAVE_LIBXAR=" ]
+  }
+
   if (llvm_enable_libxml2) {
     extra_values += [ "LLVM_ENABLE_LIBXML2=1" ]
   } else {

diff  --git a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
index ca87ca8a5c3ba..f5934086fe0cc 100644
--- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
@@ -34,6 +34,7 @@ executable("lld") {
     "//lld/lib/Driver",
     "//lld/wasm",
     "//llvm/lib/Support",
+    "//llvm/utils/gn/build/libs/xar",
   ]
   sources = [ "lld.cpp" ]
 }