golang: Optimized values to suit golang 1.23

Unexporting `GOARM64` and `GORISCV64` minimizes unnecessary exposure and potential conflicts, while adding `openbsd_riscv64` expands platform support for a more flexible build process. Co-authored-by: Tianling Shen <[email protected]> Co-authored-by: Zephyr Lykos <[email protected]> Signed-off-by: Milinda Brantini <[email protected]>
openwrt · Sep 28, 2024 · 44af166 · 44af166
1 parent 0100feb
commit 44af166
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/lang/golang/golang-build.sh b/lang/golang/golang-build.sh
@@ -120,7 +120,7 @@ build() {
 	if [ "$GO_GO_GENERATE" = 1 ]; then
 		log "Calling go generate"
 		# shellcheck disable=SC2086
-		GOOS='' GOARCH='' GO386='' GOARM='' GOMIPS='' GOMIPS64='' \
+		GOOS='' GOARCH='' GO386='' GOARM='' GOARM64='' GOMIPS='' GOMIPS64='' GORISCV64=''\
 		go generate -v $targets
 		log
 	fi

diff --git a/lang/golang/golang-compiler.mk b/lang/golang/golang-compiler.mk
@@ -25,7 +25,7 @@ endef
 define GoCompiler/Default/Make
 	( \
 		cd "$(1)/src" ; \
-		$(if $(2),GOROOT_FINAL="$(2)/lib/go-$(3)") \
+		$(if $(2),GOROOT="$(2)/lib/go-$(3)") \
 		$(4) \
 		$(BASH) make.bash \
 		$(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \

diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk
@@ -59,11 +59,13 @@ unexport \
 # Architecture-specific environment variables:
 unexport \
   GOARM \
+  GOARM64 \
   GO386 \
   GOAMD64 \
   GOMIPS \
   GOMIPS64 \
   GOPPC64 \
+  GORISCV64 \
   GOWASM
 
 # Environment variables for use with code coverage:

diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile
@@ -65,6 +65,7 @@ HOST_GO_VALID_OS_ARCH:= \
   wasip1_wasm \
   \
   freebsd_riscv64 \
+  openbsd_riscv64 \
   \
   linux_ppc64 linux_ppc64le \
   linux_mips linux_mipsle linux_mips64 linux_mips64le \
@@ -394,7 +395,7 @@ define Build/Compile
 		cd "$(PKG_BUILD_DIR)/bin" ; \
 		export $(GO_PKG_TARGET_VARS) ; \
 		$(CP) go go-host ; \
-		GOROOT_FINAL="$(PKG_GO_ROOT)" \
+		GOROOT="$(PKG_GO_ROOT)" \
 		GO_GCC_HELPER_CC="$(TARGET_CC)" \
 		GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
 		$(PKG_GO_VARS) \