Skip to content

Commit e6cae97

Browse files
mdoriertgamblin
authored andcommitted
llvm, mesa: update target comparison semantics (#12914)
* llvm: fixed issues with syntax and formatting * use spec.architecture.target.family * use spec.target instead of spec.architecture.target * mesa: use == instead of __contains__
1 parent 4e858e2 commit e6cae97

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

var/spack/repos/builtin/packages/llvm/package.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -683,16 +683,19 @@ def cmake_args(self):
683683
# hence the test to see if the version starts with "flang".
684684
targets.append('CppBackend')
685685

686-
if 'x86' in spec.architecture.target.lower():
686+
if spec.target.family == 'x86' or spec.target.family == 'x86_64':
687687
targets.append('X86')
688-
elif 'arm' in spec.architecture.target.lower():
688+
elif spec.target.family == 'arm':
689689
targets.append('ARM')
690-
elif 'aarch64' in spec.architecture.target.lower():
690+
elif spec.target.family == 'aarch64':
691691
targets.append('AArch64')
692-
elif 'sparc' in spec.architecture.target.lower():
692+
elif (spec.target.family == 'sparc' or
693+
spec.target.family == 'sparc64'):
693694
targets.append('Sparc')
694-
elif ('ppc' in spec.architecture.target.lower() or
695-
'power' in spec.architecture.target.lower()):
695+
elif (spec.target.family == 'ppc64' or
696+
spec.target.family == 'ppc64le' or
697+
spec.target.family == 'ppc' or
698+
spec.target.family == 'ppcle'):
696699
targets.append('PowerPC')
697700

698701
cmake_args.append(

var/spack/repos/builtin/packages/mesa/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def configure_args(self):
101101
args_gallium_drivers = ['swrast']
102102
args_dri_drivers = []
103103

104-
if 'arm' in spec.architecture.target.lower():
104+
if spec.target.family == 'arm':
105105
args.append('--disable-libunwind')
106106

107107
num_frontends = 0

0 commit comments

Comments
 (0)