mirror/openwrt-packages
1
0
Fork 0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-20 07:38:40 +02:00
Code Releases Activity

golang: Refactor vars common to each host compile stage into variable

Browse Source 
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2020-09-02 21:07:17 +08:00
parent 4fb4ec963f
commit 66eabf18f5
No known key found for this signature in database
GPG Key ID: C616D9E719E868E4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lang/golang/golang/Makefile
View File

@ -187,11 +187,20 @@ endif
ifeq ($(GO_HOST_PIE_SUPPORTED),1)
HOST_GO_ENABLE_PIE:=1
endif
ifeq ($(HOST_GO_ENABLE_PIE),1)
HOST_GO_INSTALL_SUFFIX:=$(GO_HOST_PIE_INSTALL_SUFFIX)
endif
$(eval $(call GoCompiler/AddProfile,Host,$(HOST_BUILD_DIR),$(HOST_GO_PREFIX),$(HOST_GO_VERSION_ID),$(GO_HOST_OS_ARCH),$(HOST_GO_INSTALL_SUFFIX)))
HOST_GO_VARS= \
GOCACHE=$(GO_BUILD_CACHE_DIR) \
GOENV=off \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE)
# when https://github.com/golang/go/issues/31544 is fixed,
# we should be able to set GO_LDFLAGS=-buildmode=pie for host make
# instead of doing a rebuild for pie
@ -202,15 +211,12 @@ define Host/Compile
mkdir -p $(GO_BUILD_CACHE_DIR)
$(call GoCompiler/Bootstrap/Make, \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE) \
$(HOST_GO_VARS) \
)
$(call GoCompiler/Host/Make, \
GOROOT_BOOTSTRAP=$(BOOTSTRAP_ROOT_DIR) \
GOCACHE=$(GO_BUILD_CACHE_DIR) \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE) \
$(HOST_GO_VARS) \
)
ifneq ($(HOST_GO_ENABLE_PIE),)
@ -219,11 +225,8 @@ define Host/Compile
( \
cd $(HOST_BUILD_DIR)/bin ; \
$(CP) go go-nopie ; \
GOCACHE=$(GO_BUILD_CACHE_DIR) \
GOENV=off \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE) \
./go-nopie install -a -buildmode=pie std cmd ; \
$(HOST_GO_VARS) \
./go-nopie install -a -buildmode pie std cmd ; \
retval=$$$$? ; \
rm -f go-nopie ; \
exit $$$$retval ; \