diff --git a/include/pybind11/conduit/pybind11_platform_abi_id.h b/include/pybind11/conduit/pybind11_platform_abi_id.h
index 30c47750df..0c5a26b50c 100644
--- a/include/pybind11/conduit/pybind11_platform_abi_id.h
+++ b/include/pybind11/conduit/pybind11_platform_abi_id.h
@@ -23,8 +23,14 @@
 #        define PYBIND11_COMPILER_TYPE "gcc_cygwin"
 #    elif defined(_MSC_VER)
 #        define PYBIND11_COMPILER_TYPE "msvc"
-#    elif defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__)
-#        define PYBIND11_COMPILER_TYPE "system" // Assumed compatible with system compiler.
+#    elif defined(__GLIBC__)                                                                      \
+        && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))
+//       // Compatibility is determined based on libstdc++ or libc++ ABI version (below).
+#        define PYBIND11_COMPILER_TYPE "glibc"
+#    elif defined(__APPLE__)                                                                      \
+        && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))
+//       // Compatibility is (usually) determined based on libc++ ABI version (below).
+#        define PYBIND11_COMPILER_TYPE "macos"
 #    else
 #        error "Unknown PYBIND11_COMPILER_TYPE: PLEASE REVISE THIS CODE."
 #    endif