diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2020-05-13 02:08:56 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2020-05-13 16:07:27 +0800 |
| commit | 25a7f0045e078cbd91d2d1de71ddd617ec4ff165 (patch) | |
| tree | 31f11f787342e0b41cafb91b9b24001b04f2aa5a /lang | |
| parent | d2f5e6966b04f71e31e6fc8fbc02c096513fe284 (diff) | |
golang: Move "go install" arguments logic, add buildid
The moves the setting of arguments for "go install" out of the shell
script in GoPackage/Build/Compile and into make.
This also adds the -buildid link flag for reproducible builds.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/golang/golang-package.mk | 59 |
1 files changed, 38 insertions, 21 deletions
diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index f336a8451..dc6038621 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -189,6 +189,43 @@ GO_PKG_VARS=$(GO_PKG_DEFAULT_VARS) # do not use for new code; this will be removed after the next OpenWrt release GoPackage/Environment=$(GO_PKG_VARS) +GO_PKG_DEFAULT_LDFLAGS= \ + -buildid '$(SOURCE_DATE_EPOCH)' \ + -linkmode external \ + -extldflags '$(patsubst -z%,-Wl$(comma)-z$(comma)%,$(TARGET_LDFLAGS))' + +GO_PKG_INSTALL_ARGS= \ + -v \ + -trimpath \ + -ldflags "all=$(GO_PKG_DEFAULT_LDFLAGS)" + +ifeq ($(GO_PKG_ENABLE_PIE),1) + GO_PKG_INSTALL_ARGS+= -buildmode pie +endif + +ifeq ($(GO_ARCH),arm) + GO_PKG_INSTALL_ARGS+= -installsuffix "v$(GO_ARM)" + +else ifneq ($(filter $(GO_ARCH),mips mipsle),) + GO_PKG_INSTALL_ARGS+= -installsuffix "$(GO_MIPS)" + +else ifneq ($(filter $(GO_ARCH),mips64 mips64le),) + GO_PKG_INSTALL_ARGS+= -installsuffix "$(GO_MIPS64)" + +endif + +ifneq ($(strip $(GO_PKG_GCFLAGS)),) + GO_PKG_INSTALL_ARGS+= -gcflags "$(GO_PKG_GCFLAGS)" +endif + +GO_PKG_CUSTOM_LDFLAGS= \ + $(GO_PKG_LDFLAGS) \ + $(patsubst %,-X %,$(GO_PKG_LDFLAGS_X)) + +ifneq ($(strip $(GO_PKG_CUSTOM_LDFLAGS)),) + GO_PKG_INSTALL_ARGS+= -ldflags "$(GO_PKG_CUSTOM_LDFLAGS) $(GO_PKG_DEFAULT_LDFLAGS)" +endif + # false if directory does not exist GoPackage/is_dir_not_empty=$$$$($(FIND) $(1) -maxdepth 0 -type d \! -empty 2>/dev/null) @@ -290,27 +327,7 @@ define GoPackage/Build/Compile \ if [ "$(strip $(GO_PKG_SOURCE_ONLY))" != 1 ]; then \ echo "Building targets" ; \ - case $(GO_ARCH) in \ - arm) installsuffix="v$(GO_ARM)" ;; \ - mips|mipsle) installsuffix="$(GO_MIPS)" ;; \ - mips64|mips64le) installsuffix="$(GO_MIPS64)" ;; \ - esac ; \ - ldflags="-linkmode external -extldflags '$(TARGET_LDFLAGS:-z%=-Wl,-z,%)'" ; \ - pkg_gcflags="$(strip $(GO_PKG_GCFLAGS))" ; \ - pkg_ldflags="$(strip $(GO_PKG_LDFLAGS))" ; \ - for def in $(GO_PKG_LDFLAGS_X); do \ - pkg_ldflags="$$$$pkg_ldflags -X $$$$def" ; \ - done ; \ - go install \ - $(if $(GO_PKG_ENABLE_PIE),-buildmode pie) \ - $$$${installsuffix:+-installsuffix $$$$installsuffix} \ - -trimpath \ - -ldflags "all=$$$$ldflags" \ - -v \ - $$$${pkg_gcflags:+-gcflags "$$$$pkg_gcflags"} \ - $$$${pkg_ldflags:+-ldflags "$$$$pkg_ldflags $$$$ldflags"} \ - $(1) \ - $$$$targets ; \ + go install $(GO_PKG_INSTALL_ARGS) $(1) $$$$targets ; \ retval=$$$$? ; \ echo ; \ \ |