From b6788c0dc519986cf5808c7fb920079fa3e20d30 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 4 May 2021 22:38:05 -0700 Subject: [PATCH] Remove most of the remaining references to gccCmd. Bug: http://b/185257607 Bug: http://b/147452927 Test: treehugger Change-Id: I5d2a8530b539811b9cb8147939b6adfaac115cc8 --- cc/makevars.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cc/makevars.go b/cc/makevars.go index 2b7bb9bb6..da5f1fde2 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -285,11 +285,14 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, } if target.Os.Class == android.Device { - ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy")) - ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld")) - ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion()) + ctx.Strict(makePrefix+"OBJCOPY", "${config.ClangBin}/llvm-objcopy") + ctx.Strict(makePrefix+"LD", "${config.ClangBin}/lld") ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain)) + // TODO: work out whether to make this "${config.ClangBin}/llvm-", which + // should mostly work, or remove it. ctx.Strict(makePrefix+"TOOLS_PREFIX", gccCmd(toolchain, "")) + // TODO: GCC version is obsolete now that GCC has been removed. + ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion()) } if target.Os.Class == android.Host {