diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86a1e2b8da0b..d6732b8feef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2038,7 +2038,9 @@ IF(WITH_AUTHENTICATION_KERBEROS)
 ENDIF()
 
 # Add system/bundled editline.
-MYSQL_CHECK_EDITLINE()
+IF(NOT WITHOUT_SERVER)
+  MYSQL_CHECK_EDITLINE()
+ENDIF()
 SET(EDITLINE_WARN_GIVEN)
 WARN_MISSING_SYSTEM_EDITLINE(EDITLINE_WARN_GIVEN)
 IF(EDITLINE_WARN_GIVEN)
@@ -2168,7 +2170,7 @@ ENDIF()
 IF((WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL) AND (LINUX_RHEL8 OR LINUX_RHEL9))
   SET(WITH_TIRPC "bundled")
 ENDIF()
-IF(LINUX)
+IF(LINUX AND NOT WITHOUT_SERVER)
   MYSQL_CHECK_RPC()
 ENDIF()