diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-09-13 10:59:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 10:59:43 -0700 |
| commit | 6468932200bf2860b1c66a007fabd8f2e47fa1e9 (patch) | |
| tree | 5e9d1836c6efde16d3404a8e346bc3e109de44f1 | |
| parent | 58e8fe2fee0f3e19bf5f25de61242586ac2a4142 (diff) | |
| parent | 22ee6e86a08d1e59608c50495d25e49378174e5a (diff) | |
Merge pull request #9981 from jefferyto/go-1.13-trimpath
golang: Use new -trimpath option when compiling Go packages
| -rw-r--r-- | lang/golang/golang-package.mk | 4 | ||||
| -rw-r--r-- | lang/golang/golang-values.mk | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index d1d189eb5..172b77897 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -275,7 +275,6 @@ define GoPackage/Build/Compile mips|mipsle) installsuffix="$(GO_MIPS)" ;; \ mips64|mips64le) installsuffix="$(GO_MIPS64)" ;; \ esac ; \ - trimpath="all=-trimpath=$(GO_PKG_BUILD_DIR)" ; \ ldflags="all=-linkmode external -extldflags '$(TARGET_LDFLAGS)'" ; \ pkg_gcflags="$(GO_PKG_GCFLAGS)" ; \ pkg_ldflags="$(GO_PKG_LDFLAGS)" ; \ @@ -284,8 +283,7 @@ define GoPackage/Build/Compile done ; \ go install \ $$$${installsuffix:+-installsuffix $$$$installsuffix} \ - -gcflags "$$$$trimpath" \ - -asmflags "$$$$trimpath" \ + -trimpath \ -ldflags "$$$$ldflags" \ -v \ $$$${pkg_gcflags:+-gcflags "$$$$pkg_gcflags"} \ diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index 78ad1b3de..a52dcc92d 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -27,6 +27,7 @@ unexport \ CC_FOR_TARGET CXX_FOR_TARGET GO_DISTFLAGS GO_GCFLAGS GO_LDFLAGS GOBUILDTIMELOGFILE GOROOT_BOOTSTRAP \ BOOT_GO_GCFLAGS GOEXPERIMENT GOBOOTSTRAP_TOOLEXEC # there are more magic environment variables to track down, but ain't nobody got time for that + # deliberately left untouched: GOPROXY GONOPROXY GOSUMDB GONOSUMDB GOPRIVATE go_arch=$(subst \ aarch64,arm64,$(subst \ |