diff options
| author | Tamir Duberstein <tamird@google.com> | 2018-12-28 07:24:56 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-28 07:26:18 -0800 |
| commit | a3217b71723a93abb7a2aca535408ab84d81ac2f (patch) | |
| tree | 7016e516eb34bfe616449e86957a98b43bbc4610 | |
| parent | 46e6577014c849d7306c63905db25f3c695fa7e7 (diff) | |
Extract go_merge into its own package
This change is needed to support building gvisor for Fuchsia, which uses
Chromium's GN build system; at the time of writing, Fuchsia's Go support
does not include explicit enumeration of files, assuming instead that Go
binaries are always built from all Go source files in a given package.
Rather than extending Fuchsia's Go support, it is easier simply to
extract a separate package here.
PiperOrigin-RevId: 227133402
Change-Id: I1c64fff286d9c014b4bd1183b76023b35b60c720
| -rw-r--r-- | tools/go_generics/BUILD | 8 | ||||
| -rw-r--r-- | tools/go_generics/defs.bzl | 2 | ||||
| -rw-r--r-- | tools/go_generics/go_merge/BUILD | 9 | ||||
| -rw-r--r-- | tools/go_generics/go_merge/main.go (renamed from tools/go_generics/merge.go) | 0 |
4 files changed, 10 insertions, 9 deletions
diff --git a/tools/go_generics/BUILD b/tools/go_generics/BUILD index 22c2e62c3..2d97d99dc 100644 --- a/tools/go_generics/BUILD +++ b/tools/go_generics/BUILD @@ -13,14 +13,6 @@ go_binary( deps = ["//tools/go_generics/globals"], ) -go_binary( - name = "go_merge", - srcs = [ - "merge.go", - ], - visibility = ["//visibility:public"], -) - genrule( name = "go_generics_tests", srcs = glob(["generics_tests/**"]) + [":go_generics"], diff --git a/tools/go_generics/defs.bzl b/tools/go_generics/defs.bzl index 631bd11d3..999fb3426 100644 --- a/tools/go_generics/defs.bzl +++ b/tools/go_generics/defs.bzl @@ -48,7 +48,7 @@ go_template = rule( "opt_types": attr.string_list(), "consts": attr.string_list(), "opt_consts": attr.string_list(), - "_tool": attr.label(executable = True, cfg = "host", default = Label("//tools/go_generics:go_merge")), + "_tool": attr.label(executable = True, cfg = "host", default = Label("//tools/go_generics/go_merge")), }, outputs = { "out": "%{name}_template.go", diff --git a/tools/go_generics/go_merge/BUILD b/tools/go_generics/go_merge/BUILD new file mode 100644 index 000000000..a60437962 --- /dev/null +++ b/tools/go_generics/go_merge/BUILD @@ -0,0 +1,9 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_binary") + +package(licenses = ["notice"]) # Apache 2.0 + +go_binary( + name = "go_merge", + srcs = ["main.go"], + visibility = ["//visibility:public"], +) diff --git a/tools/go_generics/merge.go b/tools/go_generics/go_merge/main.go index 2f83facf8..2f83facf8 100644 --- a/tools/go_generics/merge.go +++ b/tools/go_generics/go_merge/main.go |