Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dzbarsky committed Aug 11, 2024
1 parent 9cf11ce commit de1d5bb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go/private/context.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def new_source(
for k, v in getattr(attr, "x_defs", {}).items():
v = _expand_location(go, attr, v)
if "." not in k:
k = "{}.{}".format(source["importmap"], k)
k = "{}.{}".format(importmap, k)
x_defs[k] = v
source["x_defs"] = x_defs
if not source["cgo"]:
Expand Down
2 changes: 1 addition & 1 deletion go/private/rules/nogo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ def _nogo_impl(ctx):
nogo_source = new_source(
go,
struct(
srcs = [struct(files = [nogo_main])],
embed = [ctx.attr._nogo_srcs],
deps = analyzer_archives,
),
generated_srcs = [nogo_main],
name = go.label.name + "~nogo",
importpath = "nogomain",
pathtype = EXPORT_PATH,
Expand Down
2 changes: 1 addition & 1 deletion go/private/rules/test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ def _go_test_impl(ctx):
test_source = new_source(
go,
struct(
srcs = [struct(files = [main_go])],
deps = test_deps,
),
name = go.label.name + "~testmain",
importpath = "testmain",
pathtype = INFERRED_PATH,
is_main = True,
generated_srcs = [main_go],
coverage_instrumented = False,
)
test_archive, executable, runfiles = go.binary(
Expand Down

0 comments on commit de1d5bb

Please sign in to comment.