[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7671/8267] go-cross: take GOARM environment setting

[Emmanuele Bassi <ebassi src gnome org>]

commit 34fa93002742ed06d5c9170315b8430328c57dfd
Author: Matt Madison <matt@madison.systems>
Date:   Tue Sep 12 09:50:27 2017 -0300

    go-cross: take GOARM environment setting
    
    Instead of hard-coding GOARM to ${TARGET_GOARM} in
    the wrapper script, take it from an existing
    environment setting if present.  This allows the
    same cross-compiler to be used for different ARM
    targets.
    
    (From OE-Core rev: 1d319f102cd1f37ce5629c73948efae01478f866)
    
    Signed-off-by: Matt Madison <matt@madison.systems>
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/go/go-cross.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc
index df3e4ea..d18d961 100644
--- a/meta/recipes-devtools/go/go-cross.inc
+++ b/meta/recipes-devtools/go/go-cross.inc
@@ -36,7 +36,7 @@ make_wrapper() {
 here=\`dirname \$0\`
 export GOARCH="${TARGET_GOARCH}"
 export GOOS="${TARGET_GOOS}"
-export GOARM="${TARGET_GOARM}"
+export GOARM="\${GOARM:-${TARGET_GOARM}}"
 \$here/../../lib/${CROSS_TARGET_SYS_DIR}/go/bin/$1 "\$@"
 END
     chmod +x ${D}${bindir}/$2