mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'pm/build-persistent-https-with-recent-go'
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+
This commit is contained in:
commit
6395499a68
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue