gn build: Create regular archives for the sanitizer runtimes.

pcc · pcc · commit a18761ab9ef2 · 2019-02-01T20:34:43.000Z
We'll need to do this eventually if we create an installable package. For now, this lets me use the archives to build Android, whose build system wants to copy the archives to another location. Differential Revision: https://reviews.llvm.org/D57607 llvm-svn: 352907
diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
@@ -136,6 +136,14 @@ config("no_rtti") {
   }
 }
 
+# To make an archive that can be distributed, you need to remove this config and
+# set complete_static_lib.
+config("thin_archive") {
+  if (current_os != "win" && current_os != "mac") {
+    arflags = [ "-T" ]
+  }
+}
+
 config("llvm_code") {
   include_dirs = [
     "//llvm/include",
diff --git a/llvm/utils/gn/build/BUILDCONFIG.gn b/llvm/utils/gn/build/BUILDCONFIG.gn
@@ -6,6 +6,7 @@ shared_binary_target_configs = [
   "//llvm/utils/gn/build:compiler_defaults",
   "//llvm/utils/gn/build:llvm_code",
   "//llvm/utils/gn/build:no_rtti",
+  "//llvm/utils/gn/build:thin_archive",
   "//llvm/utils/gn/build:warn_covered_switch_default",
 ]
 
diff --git a/llvm/utils/gn/build/toolchain/BUILD.gn b/llvm/utils/gn/build/toolchain/BUILD.gn
@@ -50,7 +50,7 @@ template("unix_toolchain") {
         # Remove the output file first so that ar doesn't try to modify the
         # existing file.
         command =
-            "rm -f {{output}} && $ar rcsDT {{arflags}} {{output}} {{inputs}}"
+            "rm -f {{output}} && $ar rcsD {{arflags}} {{output}} {{inputs}}"
       }
       description = "AR {{output}}"
       outputs = [
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
@@ -74,7 +74,10 @@ static_library("hwasan") {
   output_dir = crt_current_out_dir
   output_name = "clang_rt.hwasan-$crt_current_target"
   complete_static_lib = true
-  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
+  configs -= [
+    "//llvm/utils/gn/build:llvm_code",
+    "//llvm/utils/gn/build:thin_archive",
+  ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   deps = [
     ":sources",
@@ -85,7 +88,10 @@ static_library("hwasan_cxx") {
   output_dir = crt_current_out_dir
   output_name = "clang_rt.hwasan_cxx-$crt_current_target"
   complete_static_lib = true
-  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
+  configs -= [
+    "//llvm/utils/gn/build:llvm_code",
+    "//llvm/utils/gn/build:thin_archive",
+  ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   deps = [
     ":cxx_sources",

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,14 @@ config("no_rtti") {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
	`139`	`+# To make an archive that can be distributed, you need to remove this config and`
	`140`	`+# set complete_static_lib.`
	`141`	`+config("thin_archive") {`
	`142`	`+ if (current_os != "win" && current_os != "mac") {`
	`143`	`+ arflags = [ "-T" ]`
	`144`	`+ }`
	`145`	`+}`
	`146`	`+`
`139`	`147`	`config("llvm_code") {`
`140`	`148`	`include_dirs = [`
`141`	`149`	`"//llvm/include",`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ shared_binary_target_configs = [`
`6`	`6`	`"//llvm/utils/gn/build:compiler_defaults",`
`7`	`7`	`"//llvm/utils/gn/build:llvm_code",`
`8`	`8`	`"//llvm/utils/gn/build:no_rtti",`
	`9`	`+ "//llvm/utils/gn/build:thin_archive",`
`9`	`10`	`"//llvm/utils/gn/build:warn_covered_switch_default",`
`10`	`11`	`]`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ template("unix_toolchain") {`
`50`	`50`	`# Remove the output file first so that ar doesn't try to modify the`
`51`	`51`	`# existing file.`
`52`	`52`	`command =`
`53`		`- "rm -f {{output}} && $ar rcsDT {{arflags}} {{output}} {{inputs}}"`
	`53`	`+ "rm -f {{output}} && $ar rcsD {{arflags}} {{output}} {{inputs}}"`
`54`	`54`	`}`
`55`	`55`	`description = "AR {{output}}"`
`56`	`56`	`outputs = [`