Skip to content

Commit 3796ede

Browse files
committed
SCA: Improve vendored library handling
Signed-off-by: Sergio Durigan Junior <[email protected]>
1 parent 786dcb2 commit 3796ede

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pkg/sca/sca.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -750,16 +750,14 @@ func generateSharedObjectNameDeps(ctx context.Context, hdl SCAHandle, generated
750750
// Vendored dependency.
751751
if pkgName == hdl.PackageName() {
752752
log.Infof(" found vendored lib %s", lib)
753-
continue
754-
}
755-
756-
if !hdl.Options().NoVendoredCrossPackageDeps {
753+
} else if !hdl.Options().NoVendoredCrossPackageDeps {
757754
log.Infof(" found vendored lib %s from package %s; depending on %s=%s", lib, pkgName, pkgName, hdl.Version())
758755
generated.Runtime = append(generated.Runtime, fmt.Sprintf("%s=%s", pkgName, hdl.Version()))
759756
} else {
760-
log.Infof(" found vendored lib %s; not generating any depends", lib)
761-
continue
757+
log.Infof(" found vendored lib %s from package %s; not generating any depends", lib, pkgName)
762758
}
759+
// We don't need to generate so-ver statements for vendored libraries.
760+
continue
763761
} else {
764762
// Regular library dependency.
765763
log.Infof(" found lib %s for %s", lib, path)

0 commit comments

Comments
 (0)