mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
dbd1294401
Running `make all` in `contrib/persistent-https` results in a failure on Go 1.7 and above. Specifically, the error is: go build -o git-remote-persistent-https \ -ldflags "-X main._BUILD_EMBED_LABEL 1468613136" # _/Users/parkr/github/git/contrib/persistent-https /usr/local/Cellar/go/1.7rc1/libexec/pkg/tool/darwin_amd64/link: -X flag requires argument of the form importpath.name=value make: *** [git-remote-persistent-https] Error 2 This `name=value` syntax for the -X flag was introduced in Go v1.5 (released Aug 19, 2015): - release notes: https://golang.org/doc/go1.5#link - commit:12795c02f3
In Go v1.7, support for the old syntax was removed: - release notes: https://tip.golang.org/doc/go1.7#compiler - commit:51b624e6a2
Add '=' between the symbol and its value for recent versions of Go, while leaving it out for older ones. Signed-off-by: Parker Moore <parkrmoore@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
1.4 KiB
Makefile
40 lines
1.4 KiB
Makefile
# Copyright 2012 Google Inc. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
BUILD_LABEL=$(shell date +"%s")
|
|
TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz
|
|
|
|
all: git-remote-persistent-https git-remote-persistent-https--proxy \
|
|
git-remote-persistent-http
|
|
|
|
git-remote-persistent-https--proxy: git-remote-persistent-https
|
|
ln -f -s git-remote-persistent-https git-remote-persistent-https--proxy
|
|
|
|
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$${EQ}$(BUILD_LABEL)"
|
|
|
|
clean:
|
|
rm -f git-remote-persistent-http* *.tar.gz
|
|
|
|
tar: clean all
|
|
@chmod 555 git-remote-persistent-https
|
|
@tar -czf $(TAR_OUT) git-remote-persistent-http* README LICENSE
|
|
@echo
|
|
@echo "Created $(TAR_OUT)"
|