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

llvm, mesa: update target comparison semantics (#12914)

Browse Source 
* 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__
This commit is contained in:
Matthieu Dorier
2019-09-25 18:41:02 -05:00
committed by Todd Gamblin
parent 4e858e24b0
commit e6cae978b8
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/llvm/package.py
View File

@@ -683,16 +683,19 @@ def cmake_args(self):
# hence the test to see if the version starts with "flang". # hence the test to see if the version starts with "flang".
targets.append('CppBackend') targets.append('CppBackend')
if 'x86' in spec.architecture.target.lower(): if spec.target.family == 'x86' or spec.target.family == 'x86_64':
targets.append('X86') targets.append('X86')
elif 'arm' in spec.architecture.target.lower(): elif spec.target.family == 'arm':
targets.append('ARM') targets.append('ARM')
elif 'aarch64' in spec.architecture.target.lower(): elif spec.target.family == 'aarch64':
targets.append('AArch64') targets.append('AArch64')
elif 'sparc' in spec.architecture.target.lower(): elif (spec.target.family == 'sparc' or
spec.target.family == 'sparc64'):
targets.append('Sparc') targets.append('Sparc')
elif ('ppc' in spec.architecture.target.lower() or elif (spec.target.family == 'ppc64' or
'power' in spec.architecture.target.lower()): spec.target.family == 'ppc64le' or
spec.target.family == 'ppc' or
spec.target.family == 'ppcle'):
targets.append('PowerPC') targets.append('PowerPC')
cmake_args.append( cmake_args.append(

2
var/spack/repos/builtin/packages/mesa/package.py
View File

@@ -101,7 +101,7 @@ def configure_args(self):
args_gallium_drivers = ['swrast'] args_gallium_drivers = ['swrast']
args_dri_drivers = [] args_dri_drivers = []
if 'arm' in spec.architecture.target.lower(): if spec.target.family == 'arm':
args.append('--disable-libunwind') args.append('--disable-libunwind')
num_frontends = 0 num_frontends = 0