All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/go: set goos variable to linux
@ 2022-05-21  3:51 Christian Stewart via buildroot
  2022-06-04 16:34 ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Christian Stewart via buildroot @ 2022-05-21  3:51 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

This commit fixes a build error when the host environment has GOOS set to
something other than "linux." For example,

cd ./buildroot
GOOS="js" make

This will cause a build failure. Override GOOS to be either empty for host
packages or set to "linux" for target packages.

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/go/go.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/go/go.mk b/package/go/go.mk
index 305a4926ee..f9445c7dd3 100644
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -73,6 +73,7 @@ endif
 HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
 HOST_GO_TARGET_ENV = \
 	$(HOST_GO_COMMON_ENV) \
+	GOOS="linux" \
 	GOARCH=$(GO_GOARCH) \
 	GOCACHE="$(HOST_GO_TARGET_CACHE)" \
 	CC="$(TARGET_CC)" \
@@ -95,6 +96,7 @@ endif
 HOST_GO_CROSS_ENV = \
 	CC_FOR_TARGET="$(TARGET_CC)" \
 	CXX_FOR_TARGET="$(TARGET_CXX)" \
+	GOOS="linux" \
 	GOARCH=$(GO_GOARCH) \
 	$(if $(GO_GO386),GO386=$(GO_GO386)) \
 	$(if $(GO_GOARM),GOARM=$(GO_GOARM)) \
@@ -109,6 +111,7 @@ endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 # For the convenience of host golang packages
 HOST_GO_HOST_ENV = \
 	$(HOST_GO_COMMON_ENV) \
+	GOOS="" \
 	GOARCH="" \
 	GOCACHE="$(HOST_GO_HOST_CACHE)" \
 	CC="$(HOSTCC_NOCCACHE)" \
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/go: set goos variable to linux
  2022-05-21  3:51 [Buildroot] [PATCH 1/1] package/go: set goos variable to linux Christian Stewart via buildroot
@ 2022-06-04 16:34 ` Yann E. MORIN
  2022-06-07 18:47   ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2022-06-04 16:34 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Thomas Petazzoni, buildroot

Christian, All,

On 2022-05-20 20:51 -0700, Christian Stewart via buildroot spake thusly:
> This commit fixes a build error when the host environment has GOOS set to
> something other than "linux." For example,
> 
> cd ./buildroot
> GOOS="js" make
> 
> This will cause a build failure. Override GOOS to be either empty for host
> packages or set to "linux" for target packages.
> 
> Signed-off-by: Christian Stewart <christian@paral.in>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/go/go.mk | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/package/go/go.mk b/package/go/go.mk
> index 305a4926ee..f9445c7dd3 100644
> --- a/package/go/go.mk
> +++ b/package/go/go.mk
> @@ -73,6 +73,7 @@ endif
>  HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
>  HOST_GO_TARGET_ENV = \
>  	$(HOST_GO_COMMON_ENV) \
> +	GOOS="linux" \
>  	GOARCH=$(GO_GOARCH) \
>  	GOCACHE="$(HOST_GO_TARGET_CACHE)" \
>  	CC="$(TARGET_CC)" \
> @@ -95,6 +96,7 @@ endif
>  HOST_GO_CROSS_ENV = \
>  	CC_FOR_TARGET="$(TARGET_CC)" \
>  	CXX_FOR_TARGET="$(TARGET_CXX)" \
> +	GOOS="linux" \
>  	GOARCH=$(GO_GOARCH) \
>  	$(if $(GO_GO386),GO386=$(GO_GO386)) \
>  	$(if $(GO_GOARM),GOARM=$(GO_GOARM)) \
> @@ -109,6 +111,7 @@ endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
>  # For the convenience of host golang packages
>  HOST_GO_HOST_ENV = \
>  	$(HOST_GO_COMMON_ENV) \
> +	GOOS="" \
>  	GOARCH="" \
>  	GOCACHE="$(HOST_GO_HOST_CACHE)" \
>  	CC="$(HOSTCC_NOCCACHE)" \
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/go: set goos variable to linux
  2022-06-04 16:34 ` Yann E. MORIN
@ 2022-06-07 18:47   ` Peter Korsgaard
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-06-07 18:47 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: Thomas Petazzoni, buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Christian, All,
 > On 2022-05-20 20:51 -0700, Christian Stewart via buildroot spake thusly:
 >> This commit fixes a build error when the host environment has GOOS set to
 >> something other than "linux." For example,
 >> 
 >> cd ./buildroot
 >> GOOS="js" make
 >> 
 >> This will cause a build failure. Override GOOS to be either empty for host
 >> packages or set to "linux" for target packages.
 >> 
 >> Signed-off-by: Christian Stewart <christian@paral.in>

 > Applied to master, thanks.

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-06-07 18:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-21  3:51 [Buildroot] [PATCH 1/1] package/go: set goos variable to linux Christian Stewart via buildroot
2022-06-04 16:34 ` Yann E. MORIN
2022-06-07 18:47   ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.