Merge "Don't use prebuilt rust stdlibs for linux bionic"
This commit is contained in:
@@ -371,8 +371,9 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
|
||||
|
||||
if !Bool(compiler.Properties.No_stdlibs) {
|
||||
for _, stdlib := range config.Stdlibs {
|
||||
// If we're building for the build host, use the prebuilt stdlibs
|
||||
if ctx.Host() && !ctx.Target().HostCross {
|
||||
// If we're building for the build host, use the prebuilt stdlibs, unless the host
|
||||
// is linux_bionic which doesn't have prebuilts.
|
||||
if ctx.Host() && !ctx.Target().HostCross && ctx.Target().Os != android.LinuxBionic {
|
||||
stdlib = "prebuilt_" + stdlib
|
||||
}
|
||||
deps.Stdlibs = append(deps.Stdlibs, stdlib)
|
||||
|
Reference in New Issue
Block a user