diff options
| author |   Will Newton <will.newton@gmail.com> | 2017-09-08 09:52:23 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-24 14:54:48 +0100 |
| commit | 93dd2f9f3edf0584f9e806c629611d645dd72dbf (patch) | |
| tree | d11b4aa4fd0e0544ea76027328c6b6752e1d725e /meta/classes/goarch.bbclass | |
| parent | 28d2d47f2a4fc3eb649cf58e82bce0525ab0bc74 (diff) | |
| download | openembedded-core-93dd2f9f3edf0584f9e806c629611d645dd72dbf.tar.gz | |
goarch.bbclass: Replace logic for setting GOARM
The previous logic applied a regex to TUNE_FEATURES which could
set the GOARM value to 7 incorrectly, for example when dealing
with an arm1176 core. Simplify to check for the presence of
"armv7" instead. At the same time add a check for "armv6" and
set GOARM to 6 in that case.
Signed-off-by: Will Newton <willn@resin.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/goarch.bbclass')
| -rw-r--r-- | meta/classes/goarch.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 4a5b2ec787..12df88f8c4 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -38,8 +38,11 @@ def go_map_arch(a, d): def go_map_arm(a, f, d): import re - if re.match('arm.*', a) and re.match('arm.*7.*', f): - return '7' + if re.match('arm.*', a): + if 'armv7' in f: + return '7' + elif 'armv6' in f: + return '6' return '' def go_map_os(o, d): |