From c3d13d9c563babb94c6d1f40d28d24f193cabe6f Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Sat, 21 Dec 2019 21:10:00 -0500
Subject: [PATCH] [gn build] fold Basic:version into Basic

This now defines HAVE_VCS_VERSION_INC for all files in Basic,
but now the BUILD.gn file has only a single "sources" field again,
and the automerger requires that. Having the automerger work for
clang/lib/Basic is a very nice to have, and the downside seems tiny.
---
 llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
index 2793931..d10a640 100644
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -13,30 +13,12 @@ write_vcsrevision("write_vcsrevision") {
   public_configs = [ ":write_vcsrevision_config" ]
 }
 
-source_set("Version") {
-  visibility = [ ":Basic" ]
-
-  configs += [ "//llvm/utils/gn/build:clang_code" ]
-  public_deps = [
-    # public_dep because public header Version.h includes generated Version.inc.
-    "//clang/include/clang/Basic:version",
-  ]
-  deps = [
-    ":write_vcsrevision",
-    "//clang/include/clang/Config",
-  ]
-  sources = [
-    "Version.cpp",
-  ]
-  defines = [ "HAVE_VCS_VERSION_INC" ]
-}
-
 static_library("Basic") {
   output_name = "clangBasic"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   public_deps = [
     # public_dep because public header Version.h includes generated Version.inc.
-    ":Version",
+    "//clang/include/clang/Basic:version",
     "//clang/include/clang/Basic:AttrList",
     "//clang/include/clang/Basic:AttrSubMatchRulesList",
     "//clang/include/clang/Basic:DiagnosticGroups",
@@ -44,9 +26,11 @@ static_library("Basic") {
     "//clang/include/clang/Basic:diags_tablegen",
   ]
   deps = [
+    ":write_vcsrevision",
     "//clang/include/clang/Basic:AttrHasAttributeImpl",
     "//clang/include/clang/Basic:arm_fp16",
     "//clang/include/clang/Basic:arm_neon",
+    "//clang/include/clang/Config",
     "//llvm/include/llvm/Config:llvm-config",
     "//llvm/lib/IR",
     "//llvm/lib/MC",
@@ -104,8 +88,10 @@ static_library("Basic") {
     "Targets/X86.cpp",
     "Targets/XCore.cpp",
     "TokenKinds.cpp",
+    "Version.cpp",
     "Warnings.cpp",
     "XRayInstr.cpp",
     "XRayLists.cpp",
   ]
+  defines = [ "HAVE_VCS_VERSION_INC" ]  # For Version.cpp
 }
-- 
2.7.4