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

Commit a8941ec6 authored by Colin Cross's avatar Colin Cross
Browse files

Don't use prebuilt rust stdlibs for linux bionic 

Linux bionic doesn't have rust stdlib prebuilts, don't use the prebuilts
when it is configured as the host os.

Bug: 216192129
Test: builds
Change-Id: I03425dee4b2e3659bf90c0a0c808cc286daa4b7f
parent f47fe386

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)