From bb630311ca16f8aa95de5dd8048f41f9603fbaad Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Thu, 18 Feb 2016 15:13:02 +0100 Subject: [PATCH] Avoid using LDFLAGS as this might be set to unexpected values in environment. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3d9623ca..fda26700 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,7 @@ gpm: $(GPM) install binary: - $(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME) + $(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(INTERNALLDFLAGS)' app/$(EXENAME) binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race binaryrace: binary @@ -119,7 +119,7 @@ extract-i18n: update-i18n: cd $(CURDIR)/src/i18n && $(MAKE) update -release: LDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE) +release: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE) release: OUTPUT = $(DIST_BIN) release: $(DIST_BIN) binary releaseassets