Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c0abf6f authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Move some make variables from GNU binutils to LLVM equivalents."

parents 6681ef31 a960a0d5

cc/makevars.go

+3 −3
Original line number Diff line number Diff line
@@ -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 {