diff options
| author | George Burgess IV <gbiv@google.com> | 2021-02-04 12:33:36 -0800 |
|---|---|---|
| committer | George Burgess IV <gbiv@google.com> | 2021-05-14 12:41:14 -0700 |
| commit | 9884dbc7ff1d0d253cfd10573e72b6ab459428e8 (patch) | |
| tree | b43469010dd2fb3b0a7cf0578f502df9d989b307 | |
| parent | f5cc9231be5ecd6d0159b352dfb014926bfa77e6 (diff) | |
| download | toolchain-utils-9884dbc7ff1d0d253cfd10573e72b6ab459428e8.tar.gz | |
Cherrypick "compiler_wrapper: add go.mod"
This cherrypicks
http://crrev.com/235f72a0dceb95dd50b9a5e4c5485d8158dfb16a from upstream.
It's not using the merge script because our current git mirroring setup
needs fixing (see my comments on PS1 of
https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1697005)
Seems better to unblock the go roll sooner rather than later, so...
Original commit message:
> compiler_wrapper: add go.mod
>
> In order to build this outside of the chroot, we apparently now need a
> go.mod file. This is autogenerated by the `go` tool.
>
> BUG=None
> TEST=Built inside and outside of the chroot
>
> Change-Id: I185cb9b626c8b3655ce5cc72524ef2511c7f575e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2676607
> Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
> Tested-by: George Burgess <gbiv@chromium.org>
Bug: None
Test: TreeHugger
Change-Id: I9ca6685e3d1c3706427089b0fb55537c9bfa9c18
| -rwxr-xr-x | compiler_wrapper/bundle.py | 2 | ||||
| -rw-r--r-- | compiler_wrapper/go.mod | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/compiler_wrapper/bundle.py b/compiler_wrapper/bundle.py index 173625f4..27b422f3 100755 --- a/compiler_wrapper/bundle.py +++ b/compiler_wrapper/bundle.py @@ -25,7 +25,7 @@ def parse_args(): def copy_files(input_dir, output_dir): for filename in os.listdir(input_dir): if ((filename.endswith('.go') and not filename.endswith('_test.go')) or - filename == 'build.py'): + filename in ('build.py', 'go.mod')): shutil.copy( os.path.join(input_dir, filename), os.path.join(output_dir, filename)) diff --git a/compiler_wrapper/go.mod b/compiler_wrapper/go.mod new file mode 100644 index 00000000..ce6df01f --- /dev/null +++ b/compiler_wrapper/go.mod @@ -0,0 +1,3 @@ +module chromium.org/toolchain-utils/compiler_wrapper + +go 1.13 |