From: Vitaly Buka <vitalybuka@google.com>
Date: Mon, 13 May 2019 22:30:53 +0000 (+0000)
Subject: [gn] Fix build
X-Git-Tag: android-x86-9.0-r1~3479
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f54491025670cd360b19e6074b66a82f64c8e2ce;p=android-x86%2Fexternal-llvm.git

[gn] Fix build

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360629 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/gn/secondary/clang/lib/AST/BUILD.gn b/utils/gn/secondary/clang/lib/AST/BUILD.gn
index fc3b0b9b0f8..9d72b38bd23 100644
--- a/utils/gn/secondary/clang/lib/AST/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/AST/BUILD.gn
@@ -66,6 +66,7 @@ static_library("AST") {
     "InheritViz.cpp",
     "ItaniumCXXABI.cpp",
     "ItaniumMangle.cpp",
+    "JSONNodeDumper.cpp",
     "Mangle.cpp",
     "MicrosoftCXXABI.cpp",
     "MicrosoftMangle.cpp",
diff --git a/utils/gn/secondary/clang/lib/Headers/BUILD.gn b/utils/gn/secondary/clang/lib/Headers/BUILD.gn
index fed72321e2a..c100abedb2c 100644
--- a/utils/gn/secondary/clang/lib/Headers/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/Headers/BUILD.gn
@@ -160,6 +160,7 @@ copy("Headers") {
     "openmp_wrappers/math.h",
     "openmp_wrappers/cmath",
     "openmp_wrappers/__clang_openmp_math.h",
+    "openmp_wrappers/__clang_openmp_math_declares.h",
   ]
   outputs = [
     "$clang_resource_dir/include/{{source_target_relative}}",
diff --git a/utils/gn/secondary/compiler-rt/test/BUILD.gn b/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 37898e2e90f..d10afc352a1 100644
--- a/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -34,6 +34,8 @@ write_cmake_config("lit_common_configured") {
     "LLVM_TOOLS_DIR=" + rebase_path("$root_build_dir/bin"),
     "LLVM_LIBRARY_OUTPUT_INTDIR=" + rebase_path("$root_build_dir/lib"),
 
+    "LLVM_LIBCXX_USED=0",
+
     "GOLD_EXECUTABLE=ld",
     "COMPILER_RT_RESOLVED_TEST_COMPILER=" +
         rebase_path("$root_build_dir/bin/clang"),