diff --git a/.github/workflows/ci_test.yaml b/.github/workflows/ci_test.yaml
index 35243bdfa645695f4222383df3a07429d607c5cf..64a1a2c6c000e2a0ebf1ecbc5c1c24fd90a3b4a6 100644
--- a/.github/workflows/ci_test.yaml
+++ b/.github/workflows/ci_test.yaml
@@ -43,7 +43,7 @@ jobs:
               if: ${{matrix.os == 'macos-latest'}}
               shell: bash
               working-directory: ${{runner.workspace}}/graph_framework/build
-              run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_METAL=ON ${{runner.workspace}}/graph_framework
+              run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OBJCXX_COMPILER=clang++ -DUSE_METAL=ON ${{runner.workspace}}/graph_framework
             - name: Configure CMake Linux
               if: ${{matrix.os == 'ubuntu-latest'}}
               shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6454fa634d016bb36a2da2294087ddf3e9a94f64..bf534530b78f67c4e81c69b4fcd268b8e727b5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,7 +266,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 # MCJIT isn't adding the compiler-rt library so explicitly add it. This is only
 # shown to happen on macOS but may affect Linux as well.
     find_library (MACOS_LIB_RT "clang_rt.osx"
-                  PATHS /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/17.0.0/lib/darwin
+                  PATHS /Applications/Xcode*.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/*/lib/darwin
                   REQUIRED
     )
 endif ()