Merge "cc: clearer OS mismatch error." into main
This commit is contained in:
2
cc/cc.go
2
cc/cc.go
@@ -3042,7 +3042,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if dep.Target().Os != ctx.Os() {
|
if dep.Target().Os != ctx.Os() {
|
||||||
ctx.ModuleErrorf("OS mismatch between %q and %q", ctx.ModuleName(), depName)
|
ctx.ModuleErrorf("OS mismatch between %q (%s) and %q (%s)", ctx.ModuleName(), ctx.Os().Name, depName, dep.Target().Os.Name)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if dep.Target().Arch.ArchType != ctx.Arch().ArchType {
|
if dep.Target().Arch.ArchType != ctx.Arch().ArchType {
|
||||||
|
Reference in New Issue
Block a user