Merge branch 'slack-vitess-r14.0.5-go1.19.10-upgrade' of github.com:s…

…lackhq/vitess into slack-vitess-r14.0.5-go1.19.10-upgrade
slackhq · Sep 13, 2023 · 167fd5d · 167fd5d
2 parents 0fa0baa + ad7d8c8
commit 167fd5d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -90,6 +90,11 @@ endif
 	if [ ! -x "${HOME}/go/bin/${GOOS}_${GOARCH}/vttablet" ]; then \
 		echo "Missing vttablet at: ${HOME}/go/bin/${GOOS}_${GOARCH}/vttablet" && exit; \
 	fi
+<<<<<<< HEAD
+=======
+
+	# Cross-compiling w/ cgo isn't trivial and we don't need vtorc, so we can skip building it
+>>>>>>> 356828b1f1 (Upgrade go slack vitess r14.0.5 (#91))
 
 debug:
 ifndef NOBANNER