From b1eea8178ae36ca82918f658b6bffd7da9fe7a1f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Feb 2021 20:13:19 -0800 Subject: go: Enable CGO and pie buildmode on rv64 go1.16 has added CGO support for riscv64 arch (From OE-Core rev: 8e078238312948e8c7b09c66ba7a186512e995d3) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-runtime_1.16.bb | 1 - meta/recipes-devtools/go/go_1.16.bb | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/go/go-runtime_1.16.bb b/meta/recipes-devtools/go/go-runtime_1.16.bb index d6ddb31ed4..63464a1501 100644 --- a/meta/recipes-devtools/go/go-runtime_1.16.bb +++ b/meta/recipes-devtools/go/go-runtime_1.16.bb @@ -1,4 +1,3 @@ -export CGO_ENABLED_riscv64 = "" require go-${PV}.inc require go-runtime.inc diff --git a/meta/recipes-devtools/go/go_1.16.bb b/meta/recipes-devtools/go/go_1.16.bb index d4812c0f0a..4e9e0ebec8 100644 --- a/meta/recipes-devtools/go/go_1.16.bb +++ b/meta/recipes-devtools/go/go_1.16.bb @@ -4,15 +4,14 @@ require go-target.inc inherit linuxloader export GOBUILDMODE="" -export CGO_ENABLED_riscv64 = "" export GO_LDSO = "${@get_linuxloader(d)}" export CC_FOR_TARGET = "gcc" export CXX_FOR_TARGET = "g++" -# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its +# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True): + if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") } -- cgit v1.2.3-54-g00ecf