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

Merge "Don't use prebuilt rust stdlibs for linux bionic" am: 4b1fe58b7d am: c60fc51c0a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143993

Change-Id: I1b438b28e983071eb1cf83d005b29a5137e4fd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-01 21:01:33 +00:00
committed by Automerger Merge Worker
parent a0cd3255ce c60fc51c0a
commit 24a19537fc
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)