diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-08-31 22:32:35 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-08-31 22:32:35 +0300 |
| commit | f78d1d6bb65ddc507cd5394da3a26dd4fd7da533 (patch) | |
| tree | ee1d210118b42615921fcf4e20226a5c5a2162e6 | |
| parent | 10979c4724d3501955507e37de0ad976a6561c32 (diff) | |
Update Makefile
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -14,7 +14,7 @@ export GITALY_TEST_RUBY_DIR := $(BUILD_DIR)/ruby BUILDTIME = $(shell date -u +%Y%m%d.%H%M%S) VERSION_PREFIXED = $(shell git describe) VERSION = $(VERSION_PREFIXED:v%=%) -LDFLAGS = -ldflags '-X $(PKG)/internal/version.version=$(VERSION) -X $(PKG)/internal/version.buildtime=$(BUILDTIME)' +GO_LDFLAGS = -ldflags '-X $(PKG)/internal/version.version=$(VERSION) -X $(PKG)/internal/version.buildtime=$(BUILDTIME)' export GOPATH := $(TARGET_DIR) export PATH := $(GOPATH)/bin:$(PATH) @@ -46,7 +46,7 @@ $(TARGET_SETUP): touch "$(TARGET_SETUP)" build: .ruby-bundle $(TARGET_SETUP) - go install $(LDFLAGS) $(COMMAND_PACKAGES) + go install $(GO_LDFLAGS) $(COMMAND_PACKAGES) cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/ .ruby-bundle: ruby/Gemfile.lock ruby/Gemfile |