| Message ID | 1508173728-29181-1-git-send-email-angelo.compagnucci@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [RFC,v2,1/4] package/go: fixing crosscompilation settings | expand |
Hello, On Mon, 16 Oct 2017 19:08:45 +0200, Angelo Compagnucci wrote: > This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable > handling which causes CGO_ENABLED to be always 0. > > Furthermore, it fixes the cross compilation options for the go compiler: > setting CGO_ENABLED should be done only for the target compiler not the > host one. > > Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> > --- > package/go/go.mk | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) Thanks applied the patch, with Christian's Acked-by. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Hello, > On Mon, 16 Oct 2017 19:08:45 +0200, Angelo Compagnucci wrote: >> This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable >> handling which causes CGO_ENABLED to be always 0. >> >> Furthermore, it fixes the cross compilation options for the go compiler: >> setting CGO_ENABLED should be done only for the target compiler not the >> host one. >> >> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> >> --- >> package/go/go.mk | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) > Thanks applied the patch, with Christian's Acked-by. Committed to 2017.08.x, thanks.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Hello, > On Mon, 16 Oct 2017 19:08:45 +0200, Angelo Compagnucci wrote: >> This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable >> handling which causes CGO_ENABLED to be always 0. >> >> Furthermore, it fixes the cross compilation options for the go compiler: >> setting CGO_ENABLED should be done only for the target compiler not the >> host one. >> >> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> >> --- >> package/go/go.mk | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) > Thanks applied the patch, with Christian's Acked-by. Committed to 2017.02.x, thanks.
diff --git a/package/go/go.mk b/package/go/go.mk index 0781dff..6035164 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -52,7 +52,7 @@ HOST_GO_TARGET_ENV = \ # set, build in cgo support for any go programs that may need it. Note that # any target package needing cgo support must include # 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. -ifeq (BR2_TOOLCHAIN_HAS_THREADS,y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 @@ -74,8 +74,8 @@ HOST_GO_MAKE_ENV = \ GOARCH=$(GO_GOARCH) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GOOS=linux \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - CC=$(HOSTCC_NOCCACHE) + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) HOST_GO_TARGET_CC = \ CC_FOR_TARGET="$(TARGET_CC)" \ @@ -83,16 +83,18 @@ HOST_GO_TARGET_CC = \ HOST_GO_HOST_CC = \ CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \ - CXX_FOR_TARGET=$(HOSTCC_NOCCACHE) + CXX_FOR_TARGET=$(HOSTCXX_NOCCACHE) HOST_GO_TMP = $(@D)/host-go-tmp define HOST_GO_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) ./make.bash + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) CGO_ENABLED=0 ./make.bash mkdir -p $(HOST_GO_TMP) mv $(@D)/pkg/tool $(HOST_GO_TMP)/ mv $(@D)/bin/ $(HOST_GO_TMP)/ - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) ./make.bash + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash endef define HOST_GO_INSTALL_CMDS
This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable handling which causes CGO_ENABLED to be always 0. Furthermore, it fixes the cross compilation options for the go compiler: setting CGO_ENABLED should be done only for the target compiler not the host one. Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> --- package/go/go.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)