diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-16 14:22:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-16 14:22:56 -0700 |
| commit | 73d21f25cb55f17325b97650ebec9293c41bc3e7 (patch) | |
| tree | c4762e50521ef9a46fbe6fe4a4240c9a3d852058 | |
| parent | 1e45ef6823b54965d19da3a33404955d8a9a2e13 (diff) | |
| download | build_soong-73d21f25cb55f17325b97650ebec9293c41bc3e7.tar.gz build_soong-73d21f25cb55f17325b97650ebec9293c41bc3e7.tar.bz2 build_soong-73d21f25cb55f17325b97650ebec9293c41bc3e7.zip | |
Add more make-exported variables
Change-Id: I6b7a30624923b8ca879d4ac7a3f1f11aec9b9b8a
| -rw-r--r-- | cc/makevars.go | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 00a4f712..247036e0 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -29,6 +29,11 @@ func init() { func makeVarsProvider(ctx common.MakeVarsContext) { ctx.Strict("LLVM_PREBUILTS_VERSION", "${clangVersion}") ctx.Strict("LLVM_PREBUILTS_BASE", "${clangBase}") + ctx.Strict("LLVM_PREBUILTS_PATH", "${clangBin}") + ctx.Strict("CLANG", "${clangBin}/clang") + ctx.Strict("CLANG_CXX", "${clangBin}/clang++") + ctx.Strict("LLVM_AS", "${clangBin}/llvm-as") + ctx.Strict("LLVM_LINK", "${clangBin}/llvm-link") hostType := common.CurrentHostType() arches := ctx.Config().HostArches[hostType] @@ -108,4 +113,16 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) } + + if ht == common.Windows { + ctx.Strict(makePrefix+"OBJDUMP", gccCmd(toolchain, "objdump")) + } + + if hod.Device() { + ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy")) + ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld")) + ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) + } + + ctx.Strict(makePrefix+"TOOLS_PREFIX", gccCmd(toolchain, "")) } |