From 47a2fffca41c0c121f819b70836fcce87ed1ee48 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 20 Feb 2021 11:09:24 -0800 Subject: goarch.bbclass: Fix ppc64le detection ppc64le should go above ppc64 in checks otherwise it gets subsumed wrongly with ppc64 check (From OE-Core rev: 126ecfe0d2ce65b2d2cf5598612e60bad7b3302e) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/goarch.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 1099b95769..73e13c0afe 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -47,7 +47,6 @@ COMPATIBLE_HOST_linux-gnux32 = "null" COMPATIBLE_HOST_linux-muslx32 = "null" COMPATIBLE_HOST_powerpc = "null" COMPATIBLE_HOST_powerpc64 = "null" -COMPATIBLE_HOST_powerpc64le = "null" COMPATIBLE_HOST_mipsarchn32 = "null" ARM_INSTRUCTION_SET_armv4 = "arm" @@ -79,10 +78,10 @@ def go_map_arch(a, d): return 'mips' elif a == 'mipsel': return 'mipsle' + elif re.match('p(pc|owerpc)(64le)', a): + return 'ppc64le' elif re.match('p(pc|owerpc)(64)', a): return 'ppc64' - elif re.match('p(pc|owerpc)(64el)', a): - return 'ppc64le' elif a == 'riscv64': return 'riscv64' else: @@ -115,5 +114,3 @@ def go_map_os(o, d): if o.startswith('linux'): return 'linux' return o - - -- cgit v1.2.3-54-g00ecf