zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spack: Correct fix_darwin_install_name (#2886)

Browse Source 
Previously, fix_darwin_install_name would only handle dependencies that have no path set, and it ignore dependencies that have the build directory as path baked in. Catch this, and replace it by the install directory.
This commit is contained in:
Erik Schnetter 2017-01-20 13:22:59 -05:00 committed by becker33
parent bc37a1012c
commit cade0181fd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spack/llnl/util/filesystem.py
View File

@ -455,7 +455,12 @@ def fix_darwin_install_name(path):
# fix all dependencies: # fix all dependencies:
for dep in deps: for dep in deps:
for loc in libs: for loc in libs:
if dep == os.path.basename(loc): # We really want to check for either
# dep == os.path.basename(loc) or
# dep == join_path(builddir, os.path.basename(loc)),
# but we don't know builddir (nor how symbolic links look
# in builddir). We thus only compare the basenames.
if os.path.basename(dep) == os.path.basename(loc):
subprocess.Popen( subprocess.Popen(
["install_name_tool", "-change", dep, loc, lib], ["install_name_tool", "-change", dep, loc, lib],
stdout=subprocess.PIPE).communicate()[0] stdout=subprocess.PIPE).communicate()[0]