diff --git a/Makefile b/Makefile
index e1a97f0ea04..14c54a53c5c 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,9 @@ STRESSFLAGS :=
 ## Cluster to use for `make roachprod-stress`
 CLUSTER :=
 
+## Verbose allows turning on verbose output from the cmake builds.
+VERBOSE :=
+
 DUPLFLAGS    := -t 100
 GOFLAGS      :=
 TAGS         :=
@@ -551,7 +554,8 @@ $(ROCKSDB_DIR)/Makefile: $(C_DEPS_DIR)/rocksdb-rebuild | bin/.submodules-initial
 	  $(if $(findstring release,$(BUILDTYPE)),-DPORTABLE=ON) -DWITH_GFLAGS=OFF \
 	  -DSNAPPY_LIBRARIES=$(LIBSNAPPY) -DSNAPPY_INCLUDE_DIR="$(SNAPPY_SRC_DIR);$(SNAPPY_DIR)" -DWITH_SNAPPY=ON \
 	  $(if $(use-stdmalloc),,-DJEMALLOC_LIBRARIES=$(LIBJEMALLOC) -DJEMALLOC_INCLUDE_DIR=$(JEMALLOC_DIR)/include -DWITH_JEMALLOC=ON) \
-	  -DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release)
+	  -DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release) \
+	  -DUSE_RTTI=1
 
 $(SNAPPY_DIR)/Makefile: $(C_DEPS_DIR)/snappy-rebuild | bin/.submodules-initialized
 	rm -rf $(SNAPPY_DIR)
diff --git a/build/variables.mk b/build/variables.mk
index e3025acefd6..538946d621c 100644
--- a/build/variables.mk
+++ b/build/variables.mk
@@ -142,6 +142,7 @@ define VALID_VARS
   UI_TS_OSS
   UNAME
   USE_ROCKSDB_ASSERTIONS
+  VERBOSE
   WEBPACK
   WEBPACK_DASHBOARD
   WEBPACK_DEV_SERVER
diff --git a/c-deps/rocksdb b/c-deps/rocksdb
index 94691beef5e..dc306254a55 160000
--- a/c-deps/rocksdb
+++ b/c-deps/rocksdb
@@ -1 +1 @@
-Subproject commit 94691beef5ebcc21671b1d3b02de7d7f2ba05020
+Subproject commit dc306254a55939066488f15b9b48fb50c3ae6b63
diff --git a/c-deps/rocksdb-rebuild b/c-deps/rocksdb-rebuild
index f6ce80b88d1..be350956ad3 100644
--- a/c-deps/rocksdb-rebuild
+++ b/c-deps/rocksdb-rebuild
@@ -1,4 +1,4 @@
 Bump the version below when changing rocksdb CMake flags. Search for "BUILD
 ARTIFACT CACHING" in build/common.mk for rationale.
 
-10
+11
diff --git a/pkg/storage/engine/rocksdb_error_test.go b/pkg/storage/engine/rocksdb_error_test.go
index 9e3c1f8e34d..f7fa335935d 100644
--- a/pkg/storage/engine/rocksdb_error_test.go
+++ b/pkg/storage/engine/rocksdb_error_test.go
@@ -63,7 +63,7 @@ func TestRocksDBErrorSafeMessage(t *testing.T) {
 		{
 			err: rErr,
 			// "locks" is redacted because this last part of the message is actually from `strerror` (ANSI-C).
-			expMsg: "io error while lock file <redacted> no <redacted> available",
+			expMsg: "io error lock <redacted> <redacted> no <redacted> available",
 		},
 		{
 			// A real-world example.