Index: src/github.com/cockroachdb/cockroach/Makefile
--- src/github.com/cockroachdb/cockroach/Makefile.orig	2019-07-02 18:50:45.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/Makefile	2019-07-10 00:45:19.948368000 +0200
@@ -319,11 +319,6 @@
 
 .SECONDARY: bin/.submodules-initialized
 bin/.submodules-initialized:
-ifneq ($(GIT_DIR),)
-	git submodule update --init --recursive
-endif
-	mkdir -p $(@D)
-	touch $@
 
 IGNORE_GOVERS :=
 
@@ -710,8 +705,8 @@
 	@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@
 	@echo "UNAME = $$(uname)" >> $@
 	@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@
-	@echo "GIT_DIR = $$(git rev-parse --git-dir 2>/dev/null)" >> $@
-	@echo "GITHOOKSDIR = $$(test -d .git && echo '.git/hooks' || git rev-parse --git-path hooks)" >> $@
+	@echo "GIT_DIR = .git" >> $@
+	@echo "GITHOOKSDIR = .git/hooks" >> $@
 	@echo "have-defs = 1" >> $@
 	$(if $(have-defs),$(info Detected change in build system. Rebooting Make.))
 
@@ -1067,10 +1062,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/pkg/storage/engine/rocksdb.go
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2019-07-02 18:50:45.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2019-07-10 00:45:19.948773000 +0200
@@ -52,6 +52,7 @@
 // #cgo LDFLAGS: -lprotobuf
 // #cgo LDFLAGS: -lrocksdb
 // #cgo LDFLAGS: -lsnappy
+// #cgo LDFLAGS: -lstdc++
 // #cgo linux LDFLAGS: -lrt -lpthread
 // #cgo windows LDFLAGS: -lshlwapi -lrpcrt4
 //
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	2019-07-10 00:45:19.948982000 +0200
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2019-07-10 00:48:18.944536000 +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>