diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/bp2build.go | 12 | ||||
| -rw-r--r-- | cc/config/x86_linux_host.go | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/cc/bp2build.go b/cc/bp2build.go index 6f9726013..aea1fa188 100644 --- a/cc/bp2build.go +++ b/cc/bp2build.go @@ -813,6 +813,8 @@ func bp2BuildParseBaseProps(ctx android.Bp2buildMutatorContext, module *Module) features := compilerAttrs.features.Clone().Append(linkerAttrs.features).Append(bp2buildSanitizerFeatures(ctx, module)) features.DeduplicateAxesFromBase() + addMuslSystemDynamicDeps(ctx, linkerAttrs) + return baseAttributes{ compilerAttrs, linkerAttrs, @@ -823,6 +825,16 @@ func bp2BuildParseBaseProps(ctx android.Bp2buildMutatorContext, module *Module) } } +// As a workaround for b/261657184, we are manually adding the default value +// of system_dynamic_deps for the linux_musl os. +// TODO: Solve this properly +func addMuslSystemDynamicDeps(ctx android.Bp2buildMutatorContext, attrs linkerAttributes) { + systemDynamicDeps := attrs.systemDynamicDeps.SelectValue(bazel.OsConfigurationAxis, "linux_musl") + if attrs.systemDynamicDeps.HasAxisSpecificValues(bazel.OsConfigurationAxis) && systemDynamicDeps.IsNil() { + attrs.systemDynamicDeps.SetSelectValue(bazel.OsConfigurationAxis, "linux_musl", android.BazelLabelForModuleDeps(ctx, config.MuslDefaultSharedLibraries)) + } +} + type fdoProfileAttributes struct { Absolute_path_profile string } diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index 740405eb9..93aa82ec5 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -112,7 +112,7 @@ var ( muslCrtBeginSharedBinary, muslCrtEndSharedBinary = []string{"libc_musl_crtbegin_dynamic"}, []string{"libc_musl_crtend"} muslCrtBeginSharedLibrary, muslCrtEndSharedLibrary = []string{"libc_musl_crtbegin_so"}, []string{"libc_musl_crtend_so"} - muslDefaultSharedLibraries = []string{"libc_musl"} + MuslDefaultSharedLibraries = []string{"libc_musl"} ) const ( @@ -331,7 +331,7 @@ func (toolchainMusl) CrtEndStaticBinary() []string { return muslCrtEndStaticB func (toolchainMusl) CrtEndSharedBinary() []string { return muslCrtEndSharedBinary } func (toolchainMusl) CrtEndSharedLibrary() []string { return muslCrtEndSharedLibrary } -func (toolchainMusl) DefaultSharedLibraries() []string { return muslDefaultSharedLibraries } +func (toolchainMusl) DefaultSharedLibraries() []string { return MuslDefaultSharedLibraries } func (toolchainMusl) Cflags() string { return "${config.LinuxMuslCflags}" |