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

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

Merge "Use "${config.ClangBin}/llvm-" for TOOLS_PREFIX."

parents f1d8819d cd9ff091

cc/makevars.go

+1 −3
Original line number Diff line number Diff line
@@ -288,9 +288,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, 
		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, ""))

		ctx.Strict(makePrefix+"TOOLS_PREFIX", "${config.ClangBin}/llvm-")

		// TODO: GCC version is obsolete now that GCC has been removed.

		ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())

	}