StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don\'t use -B...gcc.. on Darwin am: 3772da13fd

Browse Source 
am: aaaeb15c73

* commit 'aaaeb15c7396f5454ab72a37f190ab5b9003e13b':
  Don't use -B...gcc.. on Darwin

Change-Id: I150c7aa6df8fcc895d4b5cf21f9e90e5c1b1b1f4
This commit is contained in:
Dan Willemsen
2016-05-17 02:08:20 +00:00
committed by android-build-merger
parent 2729765903 aaaeb15c73
commit fc8fa79a7f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/cc.go
View File

@@ -1091,7 +1091,10 @@ func (compiler *baseCompiler) flags(ctx ModuleContext, flags Flags) Flags {
flags.LdFlags = clangFilterUnknownCflags(flags.LdFlags)
target := "-target " + toolchain.ClangTriple()
gccPrefix := "-B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin")
var gccPrefix string
if !ctx.Darwin() {
gccPrefix = "-B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin")
}
flags.CFlags = append(flags.CFlags, target, gccPrefix)
flags.AsFlags = append(flags.AsFlags, target, gccPrefix)

5
cc/makevars.go
View File

@@ -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)