diff --git a/.github/workflows/pr-compile-check.yaml b/.github/workflows/pr-compile-check.yaml
index 9f0ffbbdd42..9b85daa8be0 100644
--- a/.github/workflows/pr-compile-check.yaml
+++ b/.github/workflows/pr-compile-check.yaml
@@ -138,7 +138,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y bison cmake flex gcc libssl-dev libyaml-dev
-          sudo apt-get install -y librdkafka-dev
 
       - name: Install cmake
         uses: jwlawson/actions-setup-cmake@0d6a7d60b009d01c9e7523be22153ff8f19460d3 # v2.2.0
@@ -152,6 +151,6 @@ jobs:
         run: |
           export CXX=/bin/false
           export nparallel=$(( $(getconf _NPROCESSORS_ONLN) > 8 ? 8 : $(getconf _NPROCESSORS_ONLN) ))
-          cmake -DFLB_PREFER_SYSTEM_LIB_KAFKA=ON ../
+          cmake ../
           make -j $nparallel
         working-directory: build
diff --git a/lib/librdkafka-2.15.0/CMakeLists.txt b/lib/librdkafka-2.15.0/CMakeLists.txt
index f3d05bad7a8..8ef47053ada 100644
--- a/lib/librdkafka-2.15.0/CMakeLists.txt
+++ b/lib/librdkafka-2.15.0/CMakeLists.txt
@@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.5)
 include("packaging/cmake/parseversion.cmake")
 parseversion("src/rdkafka.h")
 
-project(RdKafka VERSION ${RDKAFKA_VERSION})
+project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C)
+
+# Check for CXX support
+include(CheckLanguage)
+check_language(CXX)
+if(CMAKE_CXX_COMPILER)
+  enable_language(CXX)
+else()
+  message(STATUS "C++ compiler not found, skipping C++ support")
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/")
 
@@ -181,7 +190,11 @@ endif()
 
 option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF)
 option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON)
-option(RDKAFKA_BUILD_TESTS "Build tests" ON)
+
+if(CMAKE_CXX_COMPILER)
+    option(RDKAFKA_BUILD_TESTS "Build tests" ON)
+endif()
+
 if(WIN32)
     option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON)
 endif(WIN32)
@@ -279,7 +292,10 @@ install(
 )
 
 add_subdirectory(src)
-add_subdirectory(src-cpp)
+
+if(CMAKE_CXX_COMPILER)
+  add_subdirectory(src-cpp)
+endif()
 
 if(RDKAFKA_BUILD_EXAMPLES)
   add_subdirectory(examples)
diff --git a/lib/librdkafka-2.15.0/examples/CMakeLists.txt b/lib/librdkafka-2.15.0/examples/CMakeLists.txt
index d9ce7ac277f..5c35c251300 100644
--- a/lib/librdkafka-2.15.0/examples/CMakeLists.txt
+++ b/lib/librdkafka-2.15.0/examples/CMakeLists.txt
@@ -5,8 +5,10 @@ endif(WIN32)
 add_executable(producer producer.c ${win32_sources})
 target_link_libraries(producer PUBLIC rdkafka)
 
-add_executable(producer_cpp producer.cpp ${win32_sources})
-target_link_libraries(producer_cpp PUBLIC rdkafka++)
+if(CMAKE_CXX_COMPILER)
+    add_executable(producer_cpp producer.cpp ${win32_sources})
+    target_link_libraries(producer_cpp PUBLIC rdkafka++)
+endif()
 
 add_executable(consumer consumer.c ${win32_sources})
 target_link_libraries(consumer PUBLIC rdkafka)
@@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka)
 add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources})
 target_link_libraries(rdkafka_performance PUBLIC rdkafka)
 
-add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
-target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
+if(CMAKE_CXX_COMPILER)
+    add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
+    target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
+endif()
 
-add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
-target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
+if(CMAKE_CXX_COMPILER)
+    add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
+    target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
+endif()
 
-add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
-target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
+if(CMAKE_CXX_COMPILER)
+    add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
+    target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
+endif()
 
 add_executable(misc misc.c ${win32_sources})
 target_link_libraries(misc PUBLIC rdkafka)
@@ -73,8 +81,10 @@ if(NOT WIN32)
     add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c)
     target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka)
 
-    add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
-    target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
+    if(CMAKE_CXX_COMPILER)
+        add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
+        target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
+    endif()
 
     add_executable(share_consumer share_consumer.c)
     target_link_libraries(share_consumer PUBLIC rdkafka)