Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10875 from jefferyto/golang-ldflags-fix-openwrt-19.07

Browse source 
[openwrt-19.07] golang: Fix ldflags when GO_PKG_LDFLAGS is set
This commit is contained in:
Rosen Penev 2019-12-26 13:53:13 -08:00 committed by GitHub
commit 73a965aea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/golang/golang-package.mk
View file

@ -275,7 +275,7 @@ define GoPackage/Build/Compile
mips|mipsle) installsuffix="$(GO_MIPS)" ;; \ mips|mipsle) installsuffix="$(GO_MIPS)" ;; \
mips64|mips64le) installsuffix="$(GO_MIPS64)" ;; \ mips64|mips64le) installsuffix="$(GO_MIPS64)" ;; \
esac ; \ esac ; \
ldflags="all=-linkmode external -extldflags '$(TARGET_LDFLAGS)'" ; \ ldflags="-linkmode external -extldflags '$(TARGET_LDFLAGS)'" ; \
pkg_gcflags="$(GO_PKG_GCFLAGS)" ; \ pkg_gcflags="$(GO_PKG_GCFLAGS)" ; \
pkg_ldflags="$(GO_PKG_LDFLAGS)" ; \ pkg_ldflags="$(GO_PKG_LDFLAGS)" ; \
for def in $(GO_PKG_LDFLAGS_X); do \ for def in $(GO_PKG_LDFLAGS_X); do \
@ -284,10 +284,10 @@ define GoPackage/Build/Compile
go install \ go install \
$$$${installsuffix:+-installsuffix $$$$installsuffix} \ $$$${installsuffix:+-installsuffix $$$$installsuffix} \
-trimpath \ -trimpath \
-ldflags "$$$$ldflags" \ -ldflags "all=$$$$ldflags" \
-v \ -v \
$$$${pkg_gcflags:+-gcflags "$$$$pkg_gcflags"} \ $$$${pkg_gcflags:+-gcflags "$$$$pkg_gcflags"} \
$$$${pkg_ldflags:+-ldflags "$$$$pkg_ldflags"} \ $$$${pkg_ldflags:+-ldflags "$$$$pkg_ldflags $$$$ldflags"} \
$(1) \ $(1) \
$$$$targets ; \ $$$$targets ; \
retval=$$$$? ; \ retval=$$$$? ; \