Skip to content

Commit afb689d

Browse files
committed
Make headers direct dependencies of the compile target
The headers from dependencies _may_ be used to produce an artifact so they should be direct dependencies.
1 parent 4cdaaf5 commit afb689d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

go/private/actions/archive.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
196196
_validation_output = out_nogo_validation,
197197
_nogo_fix_output = out_nogo_fix,
198198
_cgo_deps = cgo_deps,
199-
_headers = depset([f for f in source.srcs if f.path.split(".")[-1].lower().startswith("h")]),
199+
_headers = tuple([f for f in source.srcs if f.path.split(".")[-1].lower().startswith("h")]),
200200
)
201201
x_defs = dict(source.x_defs)
202202
for a in direct:

go/private/actions/compilepkg.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ def emit_compilepkg(
9595
archives = archives + [go.coverdata]
9696

9797
sdk = go.sdk
98-
inputs_direct = (sources + embedsrcs + [sdk.package_list] +
99-
[archive.data.export_file for archive in archives])
100-
inputs_transitive = ([sdk.headers, sdk.tools, go.stdlib.libs] +
101-
[archive.data._headers for archive in archives])
98+
inputs_direct = sources + embedsrcs + [sdk.package_list]
99+
for archive in archives:
100+
inputs_direct.append(archive.data.export_file)
101+
inputs_direct.extend(archive.data._headers)
102+
inputs_transitive = [sdk.headers, sdk.tools, go.stdlib.libs]
102103
outputs = [out_lib, out_export]
103104

104105
shared_args = go.builder_args(go, use_path_mapping = True)

0 commit comments

Comments
 (0)