diff options
| author | Chandan Singh <csingh43@bloomberg.net> | 2019-12-23 12:12:45 +0000 |
|---|---|---|
| committer | Chandan Singh <csingh43@bloomberg.net> | 2019-12-23 14:32:29 +0000 |
| commit | c28e83df2fcb52b73a6188653459e149336a1fee (patch) | |
| tree | b624823db8b232ed6ec9b6bc2dd7d74f4f3a5928 /src/buildstream/_platform | |
| parent | 0bc77c681cf7fe72499d57e082ea162d85b3edc2 (diff) | |
| download | buildstream-c28e83df2fcb52b73a6188653459e149336a1fee.tar.gz | |
_platform/platform.py: Add alias for IBM AIX 7 powerpc
* `uname -m` is unusable in case of IBM AIX 7 as it reports the serial
number of the machine. As a workaround, special case it and use the
reported processor identifier.
* tests/format/optionos.py: Don't use AIX for unsupported architecture
`AIX` is special-cased in BuildStream, so use a different system for
testing unsupported architectures.
Diffstat (limited to 'src/buildstream/_platform')
| -rw-r--r-- | src/buildstream/_platform/platform.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/buildstream/_platform/platform.py b/src/buildstream/_platform/platform.py index c6bce41e7..b58ae3e3d 100644 --- a/src/buildstream/_platform/platform.py +++ b/src/buildstream/_platform/platform.py @@ -155,6 +155,7 @@ class Platform: "i686": "x86-32", "power-isa-be": "power-isa-be", "power-isa-le": "power-isa-le", + "powerpc": "power-isa-be", "powerpc64": "power-isa-be", # Used in GCC/LLVM "powerpc64le": "power-isa-le", # Used in GCC/LLVM "ppc64": "power-isa-be", @@ -181,9 +182,16 @@ class Platform: # (string): String representing the architecture @staticmethod def get_host_arch(): - # get the hardware identifier from uname - uname_machine = platform.uname().machine - return Platform.canonicalize_arch(uname_machine) + uname = platform.uname() + + if uname.system.lower() == "aix": + # IBM AIX systems reports their serial number as the machine + # hardware identifier. So, we need to look at the reported processor + # in this case. + return Platform.canonicalize_arch(uname.processor) + else: + # Otherwise, use the hardware identifier from uname + return Platform.canonicalize_arch(uname.machine) # does_multiprocessing_start_require_pickling(): # |