diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-16 18:01:46 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-16 18:04:01 -0700 |
| commit | 3772da13fd9b4d1f0aec35c73883c1cb5b60fd35 (patch) | |
| tree | 4aa8570061b030b0bb35770bd2d9d8538c9fe2a5 /cc/makevars.go | |
| parent | 88c4750c518f3910725f74295d21286291551f5d (diff) | |
| download | build_soong-3772da13fd9b4d1f0aec35c73883c1cb5b60fd35.tar.gz build_soong-3772da13fd9b4d1f0aec35c73883c1cb5b60fd35.tar.bz2 build_soong-3772da13fd9b4d1f0aec35c73883c1cb5b60fd35.zip | |
Don't use -B...gcc.. on Darwin
We don't ship binutils on Darwin, so there is no point in telling clang
to look in that path. (The path being used doesn't even exist). This
matches the Make behavior.
Change-Id: I663047057ff8df8a349483532da8018af13d50d8
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 247036e0..91ba7481 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -86,7 +86,10 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string, if toolchain.ClangSupported() { clangPrefix := secondPrefix + "CLANG_" + typePrefix - clangExtras := "-target " + toolchain.ClangTriple() + " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin") + clangExtras := "-target " + toolchain.ClangTriple() + if ht != common.Darwin { + clangExtras += " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin") + } globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod) |