Merge "Remove duplication of bootclasspath in DefaultLibraries"
diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go
index 65fa1ed..103f91f 100644
--- a/cc/config/x86_darwin_host.go
+++ b/cc/config/x86_darwin_host.go
@@ -89,6 +89,7 @@
"10.10",
"10.11",
"10.12",
+ "10.13",
}
darwinAvailableLibraries = append(
diff --git a/cc/makevars.go b/cc/makevars.go
index 8bdcf9f..2c6af70 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -259,6 +259,10 @@
ctx.Strict(makePrefix+"NDK_TRIPLE", toolchain.ClangTriple())
}
+ if target.Os.Class == android.Host || target.Os.Class == android.HostCross {
+ ctx.Strict(makePrefix+"AVAILABLE_LIBRARIES", strings.Join(toolchain.AvailableLibraries(), " "))
+ }
+
ctx.Strict(makePrefix+"TOOLCHAIN_ROOT", toolchain.GccRoot())
ctx.Strict(makePrefix+"TOOLS_PREFIX", gccCmd(toolchain, ""))
ctx.Strict(makePrefix+"SHLIB_SUFFIX", toolchain.ShlibSuffix())