From d14215f1dbe3534aa84ae2742776b972ff4be821 Mon Sep 17 00:00:00 2001 From: SCG82 Date: Sat, 11 Jan 2020 04:01:31 -0800 Subject: [PATCH] fix mistake in algorithm: collect rpaths for file only when finding an rpath dependency --- src/DylibBundler.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/DylibBundler.cpp b/src/DylibBundler.cpp index 86c4e5e..ebbc6a8 100644 --- a/src/DylibBundler.cpp +++ b/src/DylibBundler.cpp @@ -75,6 +75,8 @@ void collectDependenciesForFile(const std::string& dependent_file) for (const auto& line : lines) { if (!Settings::isPrefixBundled(line)) continue; // skip system/ignored prefixes + if (isRpath(line)) + collectRpathsForFilename(dependent_file); addDependency(line, dependent_file); } deps_collected[dependent_file] = true; @@ -123,6 +125,8 @@ void collectSubDependencies() for (const auto& line : lines) { if (!Settings::isPrefixBundled(line)) continue; // skip system/ignored prefixes + if (isRpath(line)) + collectRpathsForFilename(searchFilenameInRpaths(line)); addDependency(line, original_path); } }