Skip to content

Commit 40aa3e7

Browse files
authored
Stop splitting sources in emit_archive (#4015)
We split them up only to combine all 7 lists again. It doesn't seem useful. **What type of PR is this?** Perf improvement/cleanup **What does this PR do? Why is it needed?** **Which issues(s) does this PR fix?** Fixes # **Other notes for review**
1 parent 64759ee commit 40aa3e7

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

go/private/actions/archive.bzl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
load(
1616
"//go/private:common.bzl",
1717
"as_tuple",
18-
"split_srcs",
1918
)
2019
load(
2120
"//go/private:mode.bzl",
@@ -45,7 +44,6 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
4544
if source == None:
4645
fail("source is a required parameter")
4746

48-
split = split_srcs(source.srcs)
4947
testfilter = getattr(source.library, "testfilter", None)
5048
pre_ext = ""
5149
if go.mode.link == LINKMODE_C_ARCHIVE:
@@ -92,7 +90,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
9290
clinkopts = [f for fs in source.clinkopts for f in fs.split(" ")]
9391
cgo = cgo_configure(
9492
go,
95-
srcs = split.go + split.c + split.asm + split.cxx + split.objc + split.headers + split.syso,
93+
srcs = source.srcs,
9694
cdeps = source.cdeps,
9795
cppopts = cppopts,
9896
copts = copts,
@@ -105,7 +103,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
105103
runfiles = runfiles.merge(cgo.runfiles)
106104
emit_compilepkg(
107105
go,
108-
sources = split.go + split.c + split.asm + split.cxx + split.objc + split.headers + split.syso,
106+
sources = source.srcs,
109107
cover = source.cover,
110108
embedsrcs = source.embedsrcs,
111109
importpath = importpath,
@@ -134,7 +132,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
134132
cgo_deps = depset()
135133
emit_compilepkg(
136134
go,
137-
sources = split.go + split.c + split.asm + split.cxx + split.objc + split.headers + split.syso,
135+
sources = source.srcs,
138136
cover = source.cover,
139137
embedsrcs = source.embedsrcs,
140138
importpath = importpath,

go/private/common.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ def split_srcs(srcs):
110110
extouts.append(src)
111111
return sources
112112

113-
def join_srcs(source):
114-
"""Combines source from a split_srcs struct into a single list."""
115-
return source.go + source.headers + source.asm + source.c + source.cxx + source.objc + source.syso
116-
117113
def os_path(ctx, path):
118114
path = str(path) # maybe convert from path type
119115
if ctx.os.name.startswith("windows"):

0 commit comments

Comments
 (0)