diff options
| author | Tim D. Smith | 2015-09-02 11:05:31 -0700 |
|---|---|---|
| committer | Dominyk Tiller | 2015-10-16 17:22:35 +0100 |
| commit | f81d561b67e2188b7fdd1cbb782cba00db08af2e (patch) | |
| tree | 6bec6a977c57ea456445efc8deb0d14aa5f1b930 /Library | |
| parent | 4ac345ca61343d6a98f3a366d820d39dbb38ecd7 (diff) | |
| download | brew-f81d561b67e2188b7fdd1cbb782cba00db08af2e.tar.bz2 | |
always use opt_prefix in install_name
dylib install_names are presently rewritten relative to HOMEBREW_PREFIX,
except for keg-only formulas, which are rewritten relative to
opt_prefix.
If we make a formula keg_only, all of its dependents need to be bumped,
since it will no longer exist in HOMEBREW_PREFIX and all of the links
will be written incorrectly.
If we always use opt_prefix, we avoid that dilemma, and make installed
packages more robust if a dependency is `brew unlink`ed.
Closes Homebrew/homebrew#43518.
Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/keg_relocate.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb index 70ce8f515..8c4994938 100644 --- a/Library/Homebrew/keg_relocate.rb +++ b/Library/Homebrew/keg_relocate.rb @@ -153,13 +153,7 @@ class Keg # the basename of the file itself. basename = File.basename(file.dylib_id) relative_dirname = file.dirname.relative_path_from(path) - shortpath = HOMEBREW_PREFIX.join(relative_dirname, basename) - - if shortpath.exist? && !options[:keg_only] - shortpath.to_s - else - opt_record.join(relative_dirname, basename).to_s - end + opt_record.join(relative_dirname, basename).to_s end def find_dylib(name) |