diff options
| author | Patrick Gartung <gartung@fnal.gov> | 2018-03-27 12:54:26 -0500 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2018-03-27 10:54:26 -0700 |
| commit | 52d55ea317bc859339a0a478dd75583127cc711c (patch) | |
| tree | ed440b343716ef574d58bc263fad870abbe4dd00 /lib | |
| parent | 0d07be278a4f77a69a33a1bd8e5da930210cc239 (diff) | |
| download | spack-52d55ea317bc859339a0a478dd75583127cc711c.tar.gz spack-52d55ea317bc859339a0a478dd75583127cc711c.tar.bz2 spack-52d55ea317bc859339a0a478dd75583127cc711c.tar.xz spack-52d55ea317bc859339a0a478dd75583127cc711c.zip | |
Fix buildcache relocate: only skip if rpaths are relative (#7605)
This fixes a check that decides when to skip buildcache relocation.
Originally the check was flawed in two ways: it would skip if the
source prefix matched the destination prefix, which no longer
matters since the source prefix is replaced with a placeholder
(so it always needs to be updated); it also would skip relocation
if the rpaths were not relative, when in fact it should be the
opposite (binaries without relative rpaths *should* be relocated,
and those without don't need it).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/binary_distribution.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 209a720df9..e87a4c7391 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -415,7 +415,7 @@ def relocate_package(workdir, allow_root): new_path = spack.store.layout.root old_path = buildinfo['buildpath'] rel = buildinfo.get('relative_rpaths', False) - if new_path == old_path and not rel: + if rel: return tty.msg("Relocating package from", |