aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-10-20 23:07:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-20 23:07:43 +0000
commitde01df77b18621b71e0a4a60c8f3b71d5debfe92 (patch)
tree589989434ded8e4cde63efc895c193c9722989ec
parentc9151ad6d91f785ae886372747c15d6777dd8b7b (diff)
parent010fb43ffecf1cd79b009979802664eb1b23d3a3 (diff)
downloadllvm-de01df77b18621b71e0a4a60c8f3b71d5debfe92.tar.gz
Merge "Build LLVM components for musl from source" am: 1c351b7e8d am: 2ed309c03e am: 010fb43ffe
Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/2256268 Change-Id: I34ac3fee9da76a90081e536b17b8c791c28df506 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--soong/llvm.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/soong/llvm.go b/soong/llvm.go
index 6a38fb56aec8..38e2f2036bae 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -98,12 +98,16 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
Linux_bionic_arm64 struct {
Enabled *bool
}
+ Linux_musl struct {
+ Enabled *bool
+ }
}
}
p := &props{}
p.Target.Darwin_arm64.Enabled = proptools.BoolPtr(true)
p.Target.Host.Enabled = proptools.BoolPtr(false)
p.Target.Linux_bionic_arm64.Enabled = proptools.BoolPtr(true)
+ p.Target.Linux_musl.Enabled = proptools.BoolPtr(true)
ctx.AppendProperties(p)
}
}