summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-03 11:42:59 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-03 11:42:59 +0000
commit954baf68b9bb7f8bc4fae2447ef16f37928ff01c (patch)
tree6ed0855be455440ea1d5aa733710da3f05a891cc
parentf0c5d4c0ef35cc43aa059cd2255e41c60c4cac77 (diff)
parent6ec088ea77e4c63958f4c2e913a9e1478f4bd7c5 (diff)
downloadmorph-954baf68b9bb7f8bc4fae2447ef16f37928ff01c.tar.gz
Merge branch 'baserock/tiagogomes/armv8'
Reviewed by * Pedro Alvarez * Sam Thursfield
-rw-r--r--morphlib/buildenvironment.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/buildenvironment.py b/morphlib/buildenvironment.py
index 68e7e756..0e02c19f 100644
--- a/morphlib/buildenvironment.py
+++ b/morphlib/buildenvironment.py
@@ -115,10 +115,14 @@ class BuildEnvironment():
# than leaving it up to individual morphologies.
if arch == 'x86_32':
cpu = 'i686'
+ elif arch == 'armv8l64':
+ cpu = 'aarch64'
+ elif arch == 'armv8b64':
+ cpu = 'aarch64_be'
else:
cpu = arch
- if arch.startswith('arm'):
+ if arch.startswith('armv7'):
abi = 'eabi'
else:
abi = ''