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

Support genrules as CrtBegin and CrtEnd in rust

Browse Source 
Musl will use a genrule output as a linker script in CrtBegin,
support genrules as Crt* dependencies.

This is equivalent to Ie384089d26459797d0b4b5fef84846507fc508ad
in cc.

Bug: 216192129
Test: m USE_HOST_MUSL=true host-native
Change-Id: Ibc08fdcff7a6bca2a1ec05b781ce929080e211bd
This commit is contained in:
Colin Cross
2022-01-24 17:22:45 -08:00
parent fe605e14ee
commit 018cbebd71
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust/rust.go
View File

@@ -1224,6 +1224,13 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
lib.exportLinkDirs(linkPath) lib.exportLinkDirs(linkPath)
lib.exportLinkObjects(linkObject.String()) lib.exportLinkObjects(linkObject.String())
} }
} else {
switch {
case depTag == cc.CrtBeginDepTag:
depPaths.CrtBegin = append(depPaths.CrtBegin, android.OutputFileForModule(ctx, dep, ""))
case depTag == cc.CrtEndDepTag:
depPaths.CrtEnd = append(depPaths.CrtEnd, android.OutputFileForModule(ctx, dep, ""))
}
} }
if srcDep, ok := dep.(android.SourceFileProducer); ok { if srcDep, ok := dep.(android.SourceFileProducer); ok {