From a960a0d5de086e4ede4e5ccd884c6b1d0cf6776f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 21 Apr 2021 10:22:55 -0700 Subject: [PATCH] Move some make variables from GNU binutils to LLVM equivalents. There are others still to look at, but this set doesn't seem to break anything for me. Bug: http://b/147452927 Test: treehugger Change-Id: I794684e23eee1326deb34bb4d5ed5831a47b8fa3 --- cc/makevars.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/makevars.go b/cc/makevars.go index 48d563606..923472a13 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -280,9 +280,9 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"STRIP", "${config.MacStripPath}") } else { ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") - ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) - ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) - ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) + ctx.Strict(makePrefix+"READELF", "${config.ClangBin}/llvm-readelf") + ctx.Strict(makePrefix+"NM", "${config.ClangBin}/llvm-nm") + ctx.Strict(makePrefix+"STRIP", "${config.ClangBin}/llvm-strip") } if target.Os.Class == android.Device {