1
0
forked from ALHP/ALHP.GO

added regex to match "options -C embed-bitcode=no and -C lto are incompatible"

This commit is contained in:
2022-11-03 15:06:56 +01:00
parent 2af46109eb
commit 930ac1f50d
2 changed files with 6 additions and 4 deletions

View File

@@ -239,9 +239,9 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
return time.Since(start), ctx.Err()
}
if p.DbPackage.Lto != dbpackage.LtoAutoDisabled && p.DbPackage.Lto != dbpackage.LtoDisabled && reLdError.Match(out.Bytes()) {
if p.DbPackage.Lto != dbpackage.LtoAutoDisabled && p.DbPackage.Lto != dbpackage.LtoDisabled && (reLdError.MatchString(out.String()) || reRustLTOError.MatchString(out.String())) {
p.DbPackage.Update().SetStatus(dbpackage.StatusQueued).SetSkipReason("non-LTO rebuild").SetLto(dbpackage.LtoAutoDisabled).ExecX(ctx)
return time.Since(start), fmt.Errorf("ld error detected, LTO disabled")
return time.Since(start), fmt.Errorf("ld/lto-incomp error detected, LTO disabled")
}
if reDownloadError.MatchString(out.String()) || rePortError.MatchString(out.String()) || reSigError.MatchString(out.String()) {