diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed52db89f..90aa97d82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -404,6 +404,12 @@ jobs:
             compiler: clang-16
             clang-runtime: '17'
 
+          - name: ubu22-clang16-runtime17-shared-libs
+            os: ubuntu-22.04
+            compiler: clang-16
+            extra_cmake_options: '-DBUILD_SHARED_LIBS=On'
+            clang-runtime: '17'
+
           - name: ubu22-clang16-runtime17-kokkos
             os: ubuntu-22.04
             compiler: clang-16
diff --git a/lib/Differentiator/CMakeLists.txt b/lib/Differentiator/CMakeLists.txt
index 5cd2fc103..0398df321 100644
--- a/lib/Differentiator/CMakeLists.txt
+++ b/lib/Differentiator/CMakeLists.txt
@@ -19,7 +19,8 @@ set_property(SOURCE Version.cpp APPEND PROPERTY
              COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC")
 
 # (Ab)use llvm facilities for adding libraries.
-add_llvm_library(cladDifferentiator
+llvm_add_library(cladDifferentiator
+  STATIC
   BaseForwardModeVisitor.cpp
   CladUtils.cpp
   ConstantFolder.cpp
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b79bde961..a1b1be766 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -8,7 +8,8 @@ set(CLAD_PLUGIN_SRC
   DerivedFnInfo.cpp
   RequiredSymbols.cpp
 )
-add_llvm_library(cladPlugin ${CLAD_PLUGIN_SRC} )
+
+llvm_add_library(cladPlugin STATIC ${CLAD_PLUGIN_SRC})
 
 if (NOT CLAD_BUILD_STATIC_ONLY)
   add_llvm_loadable_module(clad ${CLAD_PLUGIN_SRC} PLUGIN_TOOL clang)