diff options
| author | Matt Madison <matt@madison.systems> | 2017-09-12 09:50:25 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-12 23:51:37 +0100 |
| commit | 088528021d6979a8e2d6bc33d63a166e300cfde4 (patch) | |
| tree | 5d0752057c72f9bc2b3c563524e19817c36d55fb | |
| parent | 53bbd2222027b7bbca8df066a8a9a58355ae0f91 (diff) | |
| download | openembedded-core-088528021d6979a8e2d6bc33d63a166e300cfde4.tar.gz openembedded-core-088528021d6979a8e2d6bc33d63a166e300cfde4.tar.bz2 openembedded-core-088528021d6979a8e2d6bc33d63a166e300cfde4.zip | |
go.bbclass: clean up CGO_xxx settings
* use conditional assignment for the CGO_xxx
variables, so they can be overridden more easily
* remove the TOOLCHAIN_OPTIONS and TARGET_CC_ARCH
references, since those are already present in
CC and CXX
* remove the TARGET_ prefix so the values are
appropriate for native, nativesdk, etc. builds
* move the GOROOT export away from the CGO settings
and closer to its definition
Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/go.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index c0b117d155..8fb41e5c09 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -21,6 +21,7 @@ GO_PARALLEL_BUILD ?= "${@get_go_parallel_make(d)}" GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" GOROOT = "${STAGING_LIBDIR}/go" +export GOROOT export GOROOT_FINAL = "${libdir}/go" DEPENDS_GOLANG_class-target = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime" @@ -35,12 +36,12 @@ export GO = "${HOST_PREFIX}go" GOTOOLDIR = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go/pkg/tool/${BUILD_GOTUPLE}" GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}" export GOTOOLDIR -export CGO_ENABLED = "1" -export GOROOT -export CGO_CFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CFLAGS}" -export CGO_CPPFLAGS = "${TARGET_CPPFLAGS}" -export CGO_CXXFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CXXFLAGS}" -export CGO_LDFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}" + +export CGO_ENABLED ?= "1" +export CGO_CFLAGS ?= "${CFLAGS}" +export CGO_CPPFLAGS ?= "${CPPFLAGS}" +export CGO_CXXFLAGS ?= "${CXXFLAGS}" +export CGO_LDFLAGS ?= "${LDFLAGS}" GO_INSTALL ?= "${GO_IMPORT}/..." GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" |