hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a couple more bugs

Browse source
This commit is contained in:
Gregory Becker 2016-05-23 17:25:54 -07:00
parent d438ea0880
commit 1da6bbd146
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/spack/spack/build_environment.py
View file

@ -366,7 +366,8 @@ def get_rpaths(pkg):
if os.path.isdir(d.prefix.lib64)) if os.path.isdir(d.prefix.lib64))
# Second module is our compiler mod name. We use that to get rpaths from # Second module is our compiler mod name. We use that to get rpaths from
# module show output. # module show output.
rpaths.append(get_path_from_module(pkg.compiler.modules[1])) if pkg.compiler.modules and len(pkg.compiler.modules > 1):
rpaths.append(get_path_from_module(pkg.compiler.modules[1]))
return rpaths return rpaths

1
lib/spack/spack/concretize.py
View file

@ -210,7 +210,6 @@ def _concretize_target(self, spec):
spec.architecture.target = spec.root.architecture.target spec.architecture.target = spec.root.architecture.target
else: else:
spec.architecture.target = spec.architecture.platform.target('default_target') spec.architecture.target = spec.architecture.platform.target('default_target')
print spec.architecture, spec.architecture.platform, spec.architecture.platform_os, spec.architecture.target
return True #changed return True #changed
def _concretize_platform(self, spec): def _concretize_platform(self, spec):