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

Rust: Apple M1 support (#30823)

Browse source
This commit is contained in:
Adam J. Stewart 2022-06-02 17:57:40 -07:00 committed by GitHub
parent 043cc688ef
commit 8640b50258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/rust/package.py
View file

@ -150,7 +150,8 @@ class Rust(Package):
'x86_64-unknown-linux-gnu': 'b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5', 'x86_64-unknown-linux-gnu': 'b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5',
'powerpc64le-unknown-linux-gnu': '80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de', 'powerpc64le-unknown-linux-gnu': '80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de',
'aarch64-unknown-linux-gnu': '99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c', 'aarch64-unknown-linux-gnu': '99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c',
'x86_64-apple-darwin': '0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c' 'x86_64-apple-darwin': '0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c',
'aarch64-apple-darwin': 'b532672c278c25683ca63d78e82bae829eea1a32308e844954fb66cfe34ad222',
}, },
'1.58.1': { '1.58.1': {
'x86_64-unknown-linux-gnu': '4fac6df9ea49447682c333e57945bebf4f9f45ec7b08849e507a64b2ccd5f8fb', 'x86_64-unknown-linux-gnu': '4fac6df9ea49447682c333e57945bebf4f9f45ec7b08849e507a64b2ccd5f8fb',
@ -417,7 +418,10 @@ class Rust(Package):
], ],
'x86_64-apple-darwin': [ 'x86_64-apple-darwin': [
{'platform': 'darwin', 'target': 'x86_64:'} {'platform': 'darwin', 'target': 'x86_64:'}
] ],
'aarch64-apple-darwin': [
{'platform': 'darwin', 'target': 'aarch64:'},
],
} }
# Specifies the strings which represent a pre-release Rust version. These # Specifies the strings which represent a pre-release Rust version. These
@ -498,8 +502,11 @@ def get_rust_target(self):
return 'powerpc64le-unknown-linux-gnu' return 'powerpc64le-unknown-linux-gnu'
elif 'target=aarch64:' in self.spec: elif 'target=aarch64:' in self.spec:
return 'aarch64-unknown-linux-gnu' return 'aarch64-unknown-linux-gnu'
elif 'platform=darwin target=x86_64:' in self.spec: elif 'platform=darwin' in self.spec:
return 'x86_64-apple-darwin' if 'target=x86_64:' in self.spec:
return 'x86_64-apple-darwin'
elif 'target=aarch64:' in self.spec:
return 'aarch64-apple-darwin'
raise InstallError( raise InstallError(
"rust is not supported for '{0}'".format( "rust is not supported for '{0}'".format(