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

delegate to cray modules for target args on cray (#17857)

Browse Source
This commit is contained in:
Greg Becker
2022-11-04 14:50:05 -07:00
committed by GitHub
parent fb5ff901c0
commit a88c74dc17
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/build_environment.py
View File

@@ -332,7 +332,11 @@ def set_compiler_environment_variables(pkg, env):
env.set("SPACK_DTAGS_TO_ADD", compiler.enable_new_dtags) env.set("SPACK_DTAGS_TO_ADD", compiler.enable_new_dtags)
# Set the target parameters that the compiler will add # Set the target parameters that the compiler will add
isa_arg = spec.architecture.target.optimization_flags(compiler) # Don't set on cray platform because the targeting module handles this
if spec.satisfies("platform=cray"):
isa_arg = ""
else:
isa_arg = spec.architecture.target.optimization_flags(compiler)
env.set("SPACK_TARGET_ARGS", isa_arg) env.set("SPACK_TARGET_ARGS", isa_arg)
# Trap spack-tracked compiler flags as appropriate. # Trap spack-tracked compiler flags as appropriate.

4
lib/spack/spack/spec.py
View File

@@ -2755,7 +2755,9 @@ def _old_concretize(self, tests=False, deprecation_warning=True):
# Check if we can produce an optimized binary (will throw if # Check if we can produce an optimized binary (will throw if
# there are declared inconsistencies) # there are declared inconsistencies)
self.architecture.target.optimization_flags(self.compiler) # No need on platform=cray because of the targeting modules
if not self.satisfies("platform=cray"):
self.architecture.target.optimization_flags(self.compiler)
def _patches_assigned(self): def _patches_assigned(self):
"""Whether patches have been assigned to this spec by the concretizer.""" """Whether patches have been assigned to this spec by the concretizer."""