Rename ninja variables with Clang in the name

Rename the ninja variables that have an extraneous Clang in the name,
since there are no longer any non-Clang variables.

Bug: 68947919
Test: no change to command lines used to build mmma bionic
Change-Id: I081d5e1d423a66d55faece6cb1d265cd5e504d5f
This commit is contained in:
Colin Cross
2021-07-14 18:45:05 -07:00
parent c8bed31f56
commit 0523ba2675
18 changed files with 163 additions and 164 deletions

View File

@@ -79,7 +79,7 @@ func (t *toolchainLinuxX8664) RustTriple() string {
func (t *toolchainLinuxX8664) ToolchainLinkFlags() string {
// Prepend the lld flags from cc_config so we stay in sync with cc
return "${cc_config.LinuxClangLldflags} ${cc_config.LinuxX8664ClangLldflags} " +
return "${cc_config.LinuxLldflags} ${cc_config.LinuxX8664Lldflags} " +
"${config.LinuxToolchainLinkFlags} ${config.LinuxToolchainX8664LinkFlags}"
}
@@ -117,7 +117,7 @@ func (t *toolchainLinuxX86) RustTriple() string {
func (t *toolchainLinuxX86) ToolchainLinkFlags() string {
// Prepend the lld flags from cc_config so we stay in sync with cc
return "${cc_config.LinuxClangLldflags} ${cc_config.LinuxX86ClangLldflags} " +
return "${cc_config.LinuxLldflags} ${cc_config.LinuxX86Lldflags} " +
"${config.LinuxToolchainLinkFlags} ${config.LinuxToolchainX86LinkFlags}"
}