tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move libFlags as well to the RSP file for link actions

Browse source 
This is to avoid hitting command-line length issues when building with
RBE enabled for C++ links.

TESTED=ran a build with link actions and saw command-line getting
shorter in size from verbose.log
Bug: b/237480728

Change-Id: Id66165159388554bb76579080c5a6979dd670d22
This commit is contained in:
Kousik Kumar 2022-07-04 20:34:57 +00:00
parent 7bc781949a
commit 01332cf3b4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/builder.go
View file

@ -63,10 +63,10 @@ var (
ld, ldRE = pctx.RemoteStaticRules("ld", ld, ldRE = pctx.RemoteStaticRules("ld",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$reTemplate$ldCmd ${crtBegin} @${out}.rsp " + Command: "$reTemplate$ldCmd ${crtBegin} @${out}.rsp " +
"${libFlags} ${crtEnd} -o ${out} ${ldFlags} ${extraLibFlags}", "${crtEnd} -o ${out} ${ldFlags} ${extraLibFlags}",
CommandDeps: []string{"$ldCmd"}, CommandDeps: []string{"$ldCmd"},
Rspfile: "${out}.rsp", Rspfile: "${out}.rsp",
RspfileContent: "${in}", RspfileContent: "${in} ${libFlags}",
// clang -Wl,--out-implib doesn't update its output file if it hasn't changed. // clang -Wl,--out-implib doesn't update its output file if it hasn't changed.
Restat: true, Restat: true,
}, },