diff options
| author | 2021-08-30 14:26:53 -0700 | |
|---|---|---|
| committer | 2021-08-30 14:32:57 -0700 | |
| commit | e57ecb3eb8d0642eb57a602a4792dd0cb3ec6d78 (patch) | |
| tree | f6ea7f024226987869c0350141ed8894c744db97 | |
| parent | 0fd548dcd072f8cefad9243d5fad808dff64bf5c (diff) | |
Remove extra checkbuild argument from ninja tools command lines
The dangling rules check was running `ninja checkbuild -t targets rule`.
This apparently worked fine with glibc, but is failing when ninja is
compiled with musl. Musl's getopt_long is leaving "checkbuild" in argv
when calling ninja's ToolTargets, resulting in:
ninja: error: unknown target tool mode 'checkbuild'
Remove the extraneous checkbuild argument.
Bug: 190084016
Test: m checkbuild
Change-Id: I61b6475a5f7cb9d3d47232057ecfdc798864dd81
| -rw-r--r-- | ui/build/test_build.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/build/test_build.go b/ui/build/test_build.go index 57ceaba87..f9a60b604 100644 --- a/ui/build/test_build.go +++ b/ui/build/test_build.go @@ -51,7 +51,6 @@ func testForDanglingRules(ctx Context, config Config) { executable := config.PrebuiltBuildTool("ninja") commonArgs := []string{} - commonArgs = append(commonArgs, config.NinjaArgs()...) commonArgs = append(commonArgs, "-f", config.CombinedNinjaFile()) args := append(commonArgs, "-t", "targets", "rule") |