diff --git a/cmake/CppInterOp/CppInterOpConfig.cmake.in b/cmake/CppInterOp/CppInterOpConfig.cmake.in
index 51f59ef0f..d6565a0a6 100644
--- a/cmake/CppInterOp/CppInterOpConfig.cmake.in
+++ b/cmake/CppInterOp/CppInterOpConfig.cmake.in
@@ -6,6 +6,9 @@ get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}"
 get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" PATH)
 get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" PATH)
 
+# Determine CMAKE_SHARED_LIBRARY_SUFFIX based on operating system
+include(CMakeSystemSpecificInformation)
+
 ### build/install workaround
 
 if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/include")
diff --git a/lib/Interpreter/Compatibility.h b/lib/Interpreter/Compatibility.h
index 5f7229655..b84579c47 100644
--- a/lib/Interpreter/Compatibility.h
+++ b/lib/Interpreter/Compatibility.h
@@ -96,7 +96,11 @@ createClangInterpreter(std::vector<const char*>& args) {
   };
   auto it = std::find_if(args.begin(), args.end(), has_arg);
   std::vector<const char*> gpu_args = {it, args.end()};
+#ifdef __APPLE__
+  bool CudaEnabled = false;
+#else
   bool CudaEnabled = !gpu_args.empty();
+#endif
 
   clang::IncrementalCompilerBuilder CB;
   CB.SetCompilerArgs({args.begin(), it});