Index: src/github.com/cockroachdb/cockroach/Makefile
--- src/github.com/cockroachdb/cockroach/Makefile.orig	2020-05-05 01:44:00.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/Makefile	2020-05-13 19:07:01.212575000 +0200
@@ -40,8 +40,8 @@
 	@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@.tmp
 	@echo "UNAME = $$(uname)" >> $@.tmp
 	@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@.tmp
-	@echo "GIT_DIR = $$(git rev-parse --git-dir 2>/dev/null)" >> $@.tmp
-	@echo "GITHOOKSDIR = $$(test -d .git && echo '.git/hooks' || git rev-parse --git-path hooks)" >> $@.tmp
+	@echo "GIT_DIR = .git" >> $@.tmp
+	@echo "GITHOOKSDIR = .git/hooks" >> $@.tmp
 	@echo "have-defs = 1" >> $@.tmp
 	@set -e; \
 	if ! cmp -s $@.tmp $@; then \
@@ -64,12 +64,6 @@
 # checkout.
 .SECONDARY: bin/.submodules-initialized
 bin/.submodules-initialized:
-	gitdir=$$(git rev-parse --git-dir 2>/dev/null || true); \
-	if test -n "$$gitdir"; then \
-	   git submodule update --init --recursive; \
-	fi
-	mkdir -p $(@D)
-	touch $@
 
 # If the user wants to persist customizations for some variables, they
 # can do so by defining `customenv.mk` in their work tree.
@@ -1143,10 +1137,10 @@
 # For details, see the "Possible timestamp problems with diff-files?" thread on
 # the Git mailing list (http://marc.info/?l=git&m=131687596307197).
 .buildinfo/tag: | .buildinfo
-	@{ git describe --tags --dirty --match=v[0-9]* 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
+	@echo "2.2.0.alpha" >$@
 
 .buildinfo/rev: | .buildinfo
-	@git rev-parse HEAD > $@
+	@echo "0000" >$@
 
 ifneq ($(GIT_DIR),)
 # If we're in a Git checkout, we update the buildinfo information on every build
Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig	2020-05-05 01:44:21.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2020-05-13 19:06:20.966970000 +0200
@@ -25,11 +25,9 @@
 	common "github.com/knz/go-libedit/common"
 )
 
-// #cgo openbsd netbsd freebsd dragonfly darwin LDFLAGS: -ledit
-// #cgo openbsd netbsd freebsd dragonfly darwin CPPFLAGS: -Ishim
-// #cgo linux LDFLAGS: -lncurses
-// #cgo linux CFLAGS: -Wno-unused-result -Wno-pointer-sign
-// #cgo linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE
+// #cgo freebsd linux LDFLAGS: -lncurses
+// #cgo freebsd linux CFLAGS: -Wno-unused-result -Wno-pointer-sign
+// #cgo freebsd linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE
 //
 // #include <stdlib.h>
 // #include <stdio.h>