summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2018-03-04 13:09:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-06 06:43:10 -0800
commit3ffafcd9cf18051074b3a6298f754f34768e36dc (patch)
tree17ebe0dd2ea70970bf4bbd0e55ab44f29bae0b88
parent020915eb9b2dd4632b44ba7c18bd09f944a03042 (diff)
downloadpoky-3ffafcd9cf18051074b3a6298f754f34768e36dc.tar.gz
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. (From OE-Core rev: f2ff90eb7d27a2f69f5948fa8c301de30f5c8132) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/go.bbclass3
-rw-r--r--meta/classes/goarch.bbclass2
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}
34GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}" 34GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}"
35export GOTOOLDIR 35export GOTOOLDIR
36 36
37SECURITY_CFLAGS = "${SECURITY_NOPIE_CFLAGS}"
38SECURITY_LDFLAGS = ""
39
40export CGO_ENABLED ?= "1" 37export CGO_ENABLED ?= "1"
41export CGO_CFLAGS ?= "${CFLAGS}" 38export CGO_CFLAGS ?= "${CFLAGS}"
42export CGO_CPPFLAGS ?= "${CPPFLAGS}" 39export 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"
35COMPATIBLE_HOST_mipsarchn32 = "null" 35COMPATIBLE_HOST_mipsarchn32 = "null"
36ARM_INSTRUCTION_SET = "arm" 36ARM_INSTRUCTION_SET = "arm"
37TUNE_CCARGS_remove = "-march=mips32r2" 37TUNE_CCARGS_remove = "-march=mips32r2"
38SECURITY_CFLAGS_mips = "${SECURITY_NOPIE_CFLAGS}"
39SECURITY_NOPIE_CFLAGS ??= ""
38 40
39def go_map_arch(a, d): 41def go_map_arch(a, d):
40 import re 42 import re