From f2ff90eb7d27a2f69f5948fa8c301de30f5c8132 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Sun, 4 Mar 2018 13:09:33 -0800 Subject: go.bbclass, goarch.bbclass: update SECURITY_CFLAGS With go1.10 the NOPIE flags are only required for MIPS target builds, and are now incompatible for the other architectures. Signed-off-by: Matt Madison Signed-off-by: Ross Burton --- meta/classes/go.bbclass | 3 --- meta/classes/goarch.bbclass | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index a51ba3e9f0..d33d83ea7f 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -34,9 +34,6 @@ GOTOOLDIR = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go/pkg/tool/${BUILD_GOTUPLE} GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}" export GOTOOLDIR -SECURITY_CFLAGS = "${SECURITY_NOPIE_CFLAGS}" -SECURITY_LDFLAGS = "" - export CGO_ENABLED ?= "1" export CGO_CFLAGS ?= "${CFLAGS}" export CGO_CPPFLAGS ?= "${CPPFLAGS}" diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 5c8ed33b15..f54c5169e3 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -35,6 +35,8 @@ COMPATIBLE_HOST_powerpc64 = "null" COMPATIBLE_HOST_mipsarchn32 = "null" ARM_INSTRUCTION_SET = "arm" TUNE_CCARGS_remove = "-march=mips32r2" +SECURITY_CFLAGS_mips = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_NOPIE_CFLAGS ??= "" def go_map_arch(a, d): import re -- cgit 1.2.3-korg