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

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

Merge "Remove most of the remaining references to gccCmd."

parents 2e0436c7 b6788c0d

cc/makevars.go

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