Skip to content

elfdeps: look for 64 bit library matches first if binary is 64 bit #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nevun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

elfdeps: look for 64 bit library matches first if binary is 64 bit #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion internal/elfdeps/elfdeps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ var ldconfigRunner = func() ([]byte, error) {
return osexec.Command("ldconfig", "-p").Output()
}

// are we running a 64 bit binary? this is used when choosing the order
// of library paths to look in (/lib vs /lib64)
var is64bit bool

// getLdmap runs `ldconfig -p` and returns a map of soname -> path.
func getLdmap() map[string]string {
m := map[string]string{}
Expand Down Expand Up @@ -152,7 +156,10 @@ func resolveSingleSoname(soname string, rpaths []string, stdDirs []string, ldmap
// standard library directories and falling back to parsing `ldconfig -p` output.
func resolveSonames(needed []string, rpaths []string) []string {
resolved := map[string]string{}
stdDirs := []string{"/lib", "/lib64", "/usr/lib", "/usr/lib64", "/usr/local/lib"}
stdDirs := []string{"/lib", "/usr/lib", "/usr/local/lib"}
if is64bit {
stdDirs = append([]string{"/lib64", "/usr/lib64"}, stdDirs...)
}
var ldmap map[string]string

for _, soname := range needed {
Expand Down Expand Up @@ -206,6 +213,8 @@ func GetLibraryDependencies(binary string) ([]string, error) {
finalMap[interpPath] = struct{}{}
queue = append(queue, interpPath)
}
// also check if it is 64 or 32 bit
is64bit = f.Class == elf.ELFCLASS64
}

needed, rpaths := parseDynamic(f)
Expand Down