Merge pull request #13681 from jefferyto/golang-cache-fixes

golang: Cache fixes

lang/golang/golang-values.mk

@@ -236,7 +236,7 @@ endif
 
 # General build info
 
-GO_BUILD_CACHE_DIR:=$(or $(call qstrip,$(CONFIG_GOLANG_BUILD_CACHE_DIR)),$(TOPDIR)/.go-build)
+GO_BUILD_CACHE_DIR:=$(or $(call qstrip,$(CONFIG_GOLANG_BUILD_CACHE_DIR)),$(TMP_DIR)/go-build)
 GO_MOD_CACHE_DIR:=$(DL_DIR)/go-mod-cache
 
 GO_MOD_ARGS= \
@@ -249,6 +249,6 @@ GO_GENERAL_BUILD_CONFIG_VARS= \
 	GO_MOD_ARGS="$(GO_MOD_ARGS)"
 
 define Go/CacheCleanup
-	$(GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
 	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh cache_cleanup
 endef

lang/golang/golang/Config.in

@@ -17,7 +17,7 @@ config GOLANG_BUILD_CACHE_DIR
 	default ""
 	help
 	  Store the Go build cache in this directory.
-	  If not set, uses './.go-build'.
+	  If not set, uses '$(TMP_DIR)/go-build'.
 
 config GOLANG_MOD_CACHE_WORLD_READABLE
 	bool "Ensure Go module cache is world-readable"