golang: Fix conditionals not stripped

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 86fd1ebbe44e5c0747b8429493257e9317eacb07)

diff --git a/lang/golang/golang-host-build.mk b/lang/golang/golang-host-build.mk
index ee4f1ea311b44691d883fe2f42663ba27a8c88ce..4b9e29873f0fc38a7fa01be9176eb09064c1111f 100644 (file)
--- a/lang/golang/golang-host-build.mk
+++ b/lang/golang/golang-host-build.mk
@@ -107,10 +107,10 @@ GO_HOST_CUSTOM_LDFLAGS= \
 GO_HOST_INSTALL_ARGS= \
        -v \
        -ldflags "all=$(GO_HOST_DEFAULT_LDFLAGS)" \
-       $(if $(filter $(GO_HOST_ENABLE_PIE),1),-buildmode pie) \
-       $(if $(GO_HOST_GCFLAGS),-gcflags "$(GO_HOST_GCFLAGS)") \
-       $(if $(GO_HOST_CUSTOM_LDFLAGS),-ldflags "$(GO_HOST_CUSTOM_LDFLAGS) $(GO_HOST_DEFAULT_LDFLAGS)") \
-       $(if $(GO_HOST_TAGS),-tags "$(GO_HOST_TAGS)")
+       $(if $(GO_HOST_ENABLE_PIE),-buildmode pie) \
+       $(if $(strip $(GO_HOST_GCFLAGS)),-gcflags "$(GO_HOST_GCFLAGS)") \
+       $(if $(strip $(GO_HOST_CUSTOM_LDFLAGS)),-ldflags "$(GO_HOST_CUSTOM_LDFLAGS) $(GO_HOST_DEFAULT_LDFLAGS)") \
+       $(if $(strip $(GO_HOST_TAGS)),-tags "$(GO_HOST_TAGS)")
 
 define GoHost/Host/Configure
        $(GO_GENERAL_BUILD_CONFIG_VARS) \

diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk
index 6b62e5887822652bee256c363996f4d7b2c013d3..97527354c4b6b0d257ac9b9dc6cbf6e326ad99b7 100644 (file)
--- a/lang/golang/golang-package.mk
+++ b/lang/golang/golang-package.mk
@@ -241,15 +241,15 @@ GO_PKG_INSTALL_ARGS= \
        -buildvcs=false \
        -trimpath \
        -ldflags "all=$(GO_PKG_DEFAULT_LDFLAGS)" \
-       $(if $(GO_PKG_DEFAULT_GCFLAGS),-gcflags "all=$(GO_PKG_DEFAULT_GCFLAGS)") \
-       $(if $(GO_PKG_DEFAULT_ASMFLAGS),-asmflags "all=$(GO_PKG_DEFAULT_ASMFLAGS)") \
-       $(if $(filter $(GO_PKG_ENABLE_PIE),1),-buildmode pie) \
+       $(if $(strip $(GO_PKG_DEFAULT_GCFLAGS)),-gcflags "all=$(GO_PKG_DEFAULT_GCFLAGS)") \
+       $(if $(strip $(GO_PKG_DEFAULT_ASMFLAGS)),-asmflags "all=$(GO_PKG_DEFAULT_ASMFLAGS)") \
+       $(if $(GO_PKG_ENABLE_PIE),-buildmode pie) \
        $(if $(filter $(GO_ARCH),arm),-installsuffix "v$(GO_ARM)") \
        $(if $(filter $(GO_ARCH),mips mipsle),-installsuffix "$(GO_MIPS)") \
        $(if $(filter $(GO_ARCH),mips64 mips64le),-installsuffix "$(GO_MIPS64)") \
-       $(if $(GO_PKG_GCFLAGS),-gcflags "$(GO_PKG_GCFLAGS) $(GO_PKG_DEFAULT_GCFLAGS)") \
-       $(if $(GO_PKG_CUSTOM_LDFLAGS),-ldflags "$(GO_PKG_CUSTOM_LDFLAGS) $(GO_PKG_DEFAULT_LDFLAGS)") \
-       $(if $(GO_PKG_TAGS),-tags "$(GO_PKG_TAGS)")
+       $(if $(strip $(GO_PKG_GCFLAGS)),-gcflags "$(GO_PKG_GCFLAGS) $(GO_PKG_DEFAULT_GCFLAGS)") \
+       $(if $(strip $(GO_PKG_CUSTOM_LDFLAGS)),-ldflags "$(GO_PKG_CUSTOM_LDFLAGS) $(GO_PKG_DEFAULT_LDFLAGS)") \
+       $(if $(strip $(GO_PKG_TAGS)),-tags "$(GO_PKG_TAGS)")
 
 define GoPackage/Build/Configure
        $(GO_GENERAL_BUILD_CONFIG_VARS) \