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:20:14 +0100 |
| commit | 9e899bbc081cb932c1492f6d6802b908d70ef42f (patch) | |
| tree | 8479428a8e68b2e52a7082fe251a1c61024aa5d3 | |
| parent | b1d9f5ba5d75c6e4dae10d9d9b2c03fd3099721d (diff) | |
| download | openembedded-core-9e899bbc081cb932c1492f6d6802b908d70ef42f.tar.gz | |
go: centralize definition of COMPATIBLE_HOST
Put it in goarch.bbclass which all go related recipes inherit.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/go.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/goarch.bbclass | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-cross.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go.inc | 6 |
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 @@ inherit goarch -# x32 ABI is not supported on go compiler so far -COMPATIBLE_HOST_linux-gnux32 = "null" -# ppc32 is not supported in go compilers -COMPATIBLE_HOST_powerpc = "null" - GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" 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 TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" +# define here because everybody inherits this class +# +COMPATIBLE_HOST_linux-gnux32 = "null" +COMPATIBLE_HOST_powerpc = "null" +COMPATIBLE_HOST_powerpc64 = "null" + def go_map_arch(a, d): import re 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:" GOROOT_FINAL = "${libdir}/go" export GOROOT_FINAL -# x32 ABI is not supported on go compiler so far -COMPATIBLE_HOST_linux-gnux32 = "null" -# ppc32 is not supported in go compilers -COMPATIBLE_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 ''}" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" -# x32 ABI is not supported on go compiler so far -COMPATIBLE_HOST_linux-gnux32 = "null" -# ppc is not supported in go compilers -COMPATIBLE_HOST_powerpc = "null" -COMPATIBLE_HOST_powerpc64 = "null" - export GOHOSTOS = "${BUILD_GOOS}" export GOHOSTARCH = "${BUILD_GOARCH}" export GOOS = "${TARGET_GOOS}" |