commit c2b24a021639ccd6e7206b4b202a62c69ff7821e
author Nico Weber <thakis@chromium.org> Fri Apr 16 18:03:44 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Sat Apr 17 21:29:12 2021 -0700
tree fbf25f5b509277ffdfea305cfc9a7da2bbcfc70a
parent a3e501283c5d9a46795f22d00b5636aea8c60b1e

[gn build] (manually) port ca6751043d88

GitOrigin-RevId: 48cc5b0d35fe5d5bd7a9427dd6af2c0d59bd5ce2

utils/gn/secondary/lld/test/BUILD.gn

diff --git a/utils/gn/secondary/lld/test/BUILD.gn b/utils/gn/secondary/lld/test/BUILD.gn
index 9344f7e..845d425 100644
--- a/utils/gn/secondary/lld/test/BUILD.gn
+++ b/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 @@
     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 {

utils/gn/secondary/lld/tools/lld/BUILD.gn

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