Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b1fe58b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't use prebuilt rust stdlibs for linux bionic"

parents d9cb4b74 a8941ec6

rust/compiler.go

+3 −2
Original line number Diff line number Diff line
@@ -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)