diff options
| author | Gregory Becker <becker33@llnl.gov> | 2016-03-18 11:55:31 -0700 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2016-03-18 11:55:31 -0700 |
| commit | 151b04637ef01b8cde5967df6165bd245311b90a (patch) | |
| tree | 98dfd0df2dd5e13b6561e561abf40cb97a815a3b /lib | |
| parent | af7e3cadde02b2ab9b6de2c588a41663141928dd (diff) | |
| download | spack-151b04637ef01b8cde5967df6165bd245311b90a.tar.gz spack-151b04637ef01b8cde5967df6165bd245311b90a.tar.bz2 spack-151b04637ef01b8cde5967df6165bd245311b90a.tar.xz spack-151b04637ef01b8cde5967df6165bd245311b90a.zip | |
changed function name and removed hardcoded libs dir
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/__init__.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 155e190597..5d62d597cb 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -175,5 +175,5 @@ import spack.util.executable from spack.util.executable import * __all__ += spack.util.executable.__all__ -from spack.package import flat_install, flatten_dependencies, DependencyConflictError -__all__ += ['flat_install', 'flatten_dependencies', 'DependencyConflictError'] +from spack.package import install_dependency_symlinks, flatten_dependencies, DependencyConflictError +__all__ += ['install_dependency_symlinks', 'flatten_dependencies', 'DependencyConflictError'] diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 1a962268cf..4c458522e0 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1211,10 +1211,9 @@ class Package(object): return " ".join("-Wl,-rpath,%s" % p for p in self.rpath) -def flat_install(pkg, spec, prefix): +def install_dependency_symlinks(pkg, spec, prefix): """Execute a dummy install and flatten dependencies""" - os.mkdir(prefix+'/libs') - flatten_dependencies(spec, prefix+'/libs') + flatten_dependencies(spec, prefix) def flatten_dependencies(spec, flat_dir): """Make each dependency of spec present in dir via symlink.""" |