summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:27 -0700
commitd1d9c3cc608ca281c1bd9b40b14fa8d60cb64773 (patch)
tree60b1ec8792779e82d000a7cf6c8c30a9b025e3e8
parent366d2d5f485c7d0b288520c4f7249e0380c5a9b3 (diff)
parentaccb613afd2298510f6fc02e0ed05ecb84f6a6ff (diff)
downloadgit-d1d9c3cc608ca281c1bd9b40b14fa8d60cb64773.tar.gz
Merge branch 'pm/build-persistent-https-with-recent-go' into maint
The build procedure for "git persistent-https" helper (in contrib/) has been updated so that it can be built with more recent versions of Go. * pm/build-persistent-https-with-recent-go: contrib/persistent-https: use Git version for build label contrib/persistent-https: update ldflags syntax for Go 1.7+
-rw-r--r--contrib/persistent-https/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/persistent-https/Makefile b/contrib/persistent-https/Makefile
index 92baa3beee..52b84ba3d4 100644
--- a/contrib/persistent-https/Makefile
+++ b/contrib/persistent-https/Makefile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-BUILD_LABEL=$(shell date +"%s")
+BUILD_LABEL=$(shell cut -d" " -f3 ../../GIT-VERSION-FILE)
TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz
all: git-remote-persistent-https git-remote-persistent-https--proxy \
@@ -25,8 +25,10 @@ git-remote-persistent-http: git-remote-persistent-https
ln -f -s git-remote-persistent-https git-remote-persistent-http
git-remote-persistent-https:
+ case $$(go version) in \
+ "go version go"1.[0-5].*) EQ=" " ;; *) EQ="=" ;; esac && \
go build -o git-remote-persistent-https \
- -ldflags "-X main._BUILD_EMBED_LABEL $(BUILD_LABEL)"
+ -ldflags "-X main._BUILD_EMBED_LABEL$${EQ}$(BUILD_LABEL)"
clean:
rm -f git-remote-persistent-http* *.tar.gz