gn build: (manually) merge r369940

llvm-svn: 369948

2 files changed, 8 insertions, 0 deletions

diff --git a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
index ee12adbce43..fccfe852f67 100644
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -44,6 +44,7 @@ static_library("Basic") {
     "Sanitizers.cpp",
     "SourceLocation.cpp",
     "SourceManager.cpp",
+    "Stack.cpp",
     "TargetInfo.cpp",
     "Targets.cpp",
     "Targets/AArch64.cpp",
diff --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn
index 7cb97537713..f8945f59ce0 100644
--- a/llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -2,6 +2,7 @@ import("//clang/lib/ARCMigrate/enable.gni")
 import("//clang/lib/StaticAnalyzer/Frontend/enable.gni")
 import("//llvm/lib/Target/targets.gni")
 import("//llvm/triples.gni")
+import("//llvm/utils/gn/build/libs/pthread/enable.gni")
 import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
 import("clang_lit_site_cfg_files.gni")
@@ -100,6 +101,12 @@ write_lit_config("lit_site_cfg") {
     # FIXME: Analysis/plugins need global -fPIC
     extra_values += [ "LLVM_ENABLE_PLUGINS=0" ]
   }
+
+  if (llvm_enable_threads) {
+    extra_values += [ "LLVM_ENABLE_THREADS=1" ]
+  } else {
+    extra_values += [ "LLVM_ENABLE_THREADS=0" ]  # Must be 0.
+  }
 }
 
 write_lit_config("lit_unit_site_cfg") {