fix up packages for new architecture.
This commit is contained in:
parent
40d25d9062
commit
76dfaa71a7
@ -87,7 +87,7 @@ def install(self, spec, prefix):
|
||||
configure(*options)
|
||||
make('all')
|
||||
|
||||
if spec.architecture.startswith('darwin'):
|
||||
if spec.satisfies('platform=darwin'):
|
||||
mkdirp(prefix.bin)
|
||||
for filename in glob("bin/*.x"):
|
||||
install(filename, prefix.bin)
|
||||
|
@ -37,7 +37,7 @@ class Libpciaccess(Package):
|
||||
|
||||
def install(self, spec, prefix):
|
||||
# libpciaccess does not support OS X
|
||||
if spec.satisfies('arch=darwin-x86_64'):
|
||||
if spec.satisfies('platform=darwin'):
|
||||
# create a dummy directory
|
||||
mkdir(prefix.lib)
|
||||
return
|
||||
|
@ -267,16 +267,16 @@ def install(self, spec, prefix):
|
||||
|
||||
if '+all_targets' not in spec: # all is default on cmake
|
||||
targets = ['CppBackend', 'NVPTX', 'AMDGPU']
|
||||
if 'x86' in spec.architecture.lower():
|
||||
if 'x86' in spec.architecture.target.lower():
|
||||
targets.append('X86')
|
||||
elif 'arm' in spec.architecture.lower():
|
||||
elif 'arm' in spec.architecture.target.lower():
|
||||
targets.append('ARM')
|
||||
elif 'aarch64' in spec.architecture.lower():
|
||||
elif 'aarch64' in spec.architecture.target.lower():
|
||||
targets.append('AArch64')
|
||||
elif 'sparc' in spec.architecture.lower():
|
||||
elif 'sparc' in spec.architecture.target.lower():
|
||||
targets.append('sparc')
|
||||
elif ('ppc' in spec.architecture.lower() or
|
||||
'power' in spec.architecture.lower()):
|
||||
elif ('ppc' in spec.architecture.target.lower() or
|
||||
'power' in spec.architecture.target.lower()):
|
||||
targets.append('PowerPC')
|
||||
|
||||
cmake_args.append('-DLLVM_TARGETS_TO_BUILD:Bool=' + ';'.join(targets))
|
||||
|
@ -57,7 +57,7 @@ class Lua(Package):
|
||||
placement='luarocks')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
if spec.satisfies("arch=darwin-i686") or spec.satisfies("arch=darwin-x86_64"):
|
||||
if spec.satisfies("platform=darwin"):
|
||||
target = 'macosx'
|
||||
else:
|
||||
target = 'linux'
|
||||
|
Loading…
Reference in New Issue
Block a user