diff options
author | Joe Slater <jslater@windriver.com> | 2017-07-26 15:14:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-27 22:36:52 +0100 |
commit | 25717652b6d600bed1b938c4a034b0d5f7fb661c (patch) | |
tree | 0f97955e68af0e0c6c0e96a4ef30d8d337921d1e /meta/classes | |
parent | 111c426a33a16148d109bfcdfbeaaeac68ae3bcf (diff) | |
download | poky-25717652b6d600bed1b938c4a034b0d5f7fb661c.tar.gz |
go: centralize definition of COMPATIBLE_HOST
Put it in goarch.bbclass which all go related recipes inherit.
(From OE-Core rev: 9e899bbc081cb932c1492f6d6802b908d70ef42f)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/go.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/goarch.bbclass | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 85f71a2e9a..cedda68c55 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass | |||
@@ -1,10 +1,5 @@ | |||
1 | inherit goarch | 1 | inherit goarch |
2 | 2 | ||
3 | # x32 ABI is not supported on go compiler so far | ||
4 | COMPATIBLE_HOST_linux-gnux32 = "null" | ||
5 | # ppc32 is not supported in go compilers | ||
6 | COMPATIBLE_HOST_powerpc = "null" | ||
7 | |||
8 | GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" | 3 | GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" |
9 | GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" | 4 | GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" |
10 | GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin" | 5 | GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin" |
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 4a5b2ec787..57537fbc09 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass | |||
@@ -11,6 +11,12 @@ TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', True), d.getVar('TUNE_FEAT | |||
11 | TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" | 11 | TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" |
12 | GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" | 12 | GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" |
13 | 13 | ||
14 | # define here because everybody inherits this class | ||
15 | # | ||
16 | COMPATIBLE_HOST_linux-gnux32 = "null" | ||
17 | COMPATIBLE_HOST_powerpc = "null" | ||
18 | COMPATIBLE_HOST_powerpc64 = "null" | ||
19 | |||
14 | def go_map_arch(a, d): | 20 | def go_map_arch(a, d): |
15 | import re | 21 | import re |
16 | if re.match('i.86', a): | 22 | if re.match('i.86', a): |