From: Michael Pratt Date: Fri, 20 May 2022 08:38:41 +0000 (-0400) Subject: golang: split compile recipe into configure and compile X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=abf28899a0484216e070476c1eb016525c6d6d7d;p=feed%2Fpackages.git golang: split compile recipe into configure and compile the default Configure recipe for packages assumes that there is a "configure" script in the source tree directory Go does not have such a script, configure and compile is done with the same script so split the current Compile recipe into both Configure and Compile recipes Signed-off-by: Michael Pratt --- diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 30457910a4..c13025cfee 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -207,12 +207,14 @@ HOST_GO_VARS= \ CC="$(HOSTCC_NOCACHE)" \ CXX="$(HOSTCXX_NOCACHE)" -define Host/Compile +define Host/Configure $(call GoCompiler/Bootstrap/CheckHost,$(BOOTSTRAP_GO_VALID_OS_ARCH)) $(call GoCompiler/Host/CheckHost,$(HOST_GO_VALID_OS_ARCH)) mkdir -p "$(GO_BUILD_CACHE_DIR)" +endef +define Host/Compile $(call GoCompiler/Bootstrap/Make, \ $(HOST_GO_VARS) \ ) @@ -300,9 +302,11 @@ PKG_GO_INSTALL_ARGS= \ $(if $(PKG_GO_ASMFLAGS),-asmflags "all=$(PKG_GO_ASMFLAGS)") \ $(if $(filter $(GO_PKG_ENABLE_PIE),1),-buildmode pie) -define Build/Compile +define Build/Configure mkdir -p "$(GO_BUILD_CACHE_DIR)" +endef +define Build/Compile @echo "Building target Go first stage" $(call GoCompiler/Package/Make, \