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

Don't use prebuilt rust stdlibs for linux bionic

Browse Source 
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
This commit is contained in:
Colin Cross
2022-07-01 11:17:22 -07:00
parent f47fe38686
commit a8941ec69f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rust/compiler.go
View File

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