summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/go.bbclass5
-rw-r--r--meta/classes/goarch.bbclass6
-rw-r--r--meta/recipes-devtools/go/go-cross.inc4
-rw-r--r--meta/recipes-devtools/go/go.inc6
4 files changed, 6 insertions, 15 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 @@
1inherit goarch 1inherit goarch
2 2
3# x32 ABI is not supported on go compiler so far
4COMPATIBLE_HOST_linux-gnux32 = "null"
5# ppc32 is not supported in go compilers
6COMPATIBLE_HOST_powerpc = "null"
7
8GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" 3GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
9GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" 4GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
10GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin" 5GOBIN_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
11TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" 11TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
12GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" 12GO_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#
16COMPATIBLE_HOST_linux-gnux32 = "null"
17COMPATIBLE_HOST_powerpc = "null"
18COMPATIBLE_HOST_powerpc64 = "null"
19
14def go_map_arch(a, d): 20def 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):
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc
index 71e461123c..1c2d9e3a3d 100644
--- a/meta/recipes-devtools/go/go-cross.inc
+++ b/meta/recipes-devtools/go/go-cross.inc
@@ -13,7 +13,3 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:"
13GOROOT_FINAL = "${libdir}/go" 13GOROOT_FINAL = "${libdir}/go"
14export GOROOT_FINAL 14export GOROOT_FINAL
15 15
16# x32 ABI is not supported on go compiler so far
17COMPATIBLE_HOST_linux-gnux32 = "null"
18# ppc32 is not supported in go compilers
19COMPATIBLE_HOST_powerpc = "null"
diff --git a/meta/recipes-devtools/go/go.inc b/meta/recipes-devtools/go/go.inc
index 91d040d483..52abbebd7e 100644
--- a/meta/recipes-devtools/go/go.inc
+++ b/meta/recipes-devtools/go/go.inc
@@ -12,12 +12,6 @@ DEPENDS += "${@ 'libgcc' if not oe.utils.inherits(d, 'cross') else ''}"
12INHIBIT_PACKAGE_STRIP = "1" 12INHIBIT_PACKAGE_STRIP = "1"
13INHIBIT_SYSROOT_STRIP = "1" 13INHIBIT_SYSROOT_STRIP = "1"
14 14
15# x32 ABI is not supported on go compiler so far
16COMPATIBLE_HOST_linux-gnux32 = "null"
17# ppc is not supported in go compilers
18COMPATIBLE_HOST_powerpc = "null"
19COMPATIBLE_HOST_powerpc64 = "null"
20
21export GOHOSTOS = "${BUILD_GOOS}" 15export GOHOSTOS = "${BUILD_GOOS}"
22export GOHOSTARCH = "${BUILD_GOARCH}" 16export GOHOSTARCH = "${BUILD_GOARCH}"
23export GOOS = "${TARGET_GOOS}" 17export GOOS = "${TARGET_GOOS}"