Merge e46982c2f0 into 83b92ceb35

include/pybind11/conduit/pybind11_platform_abi_id.h

@@ -73,14 +73,11 @@
 #    elif defined(__NVCOMPILER)        // NVHPC (PGI-based).
 #        define PYBIND11_BUILD_ABI ""  // TODO: What should be here, to prevent UB?
 #    elif defined(_LIBCPP_ABI_VERSION) // https://libcxx.llvm.org/DesignDocs/ABIVersioning.html
-#        define PYBIND11_BUILD_ABI "_abi" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION)
+#        define PYBIND11_BUILD_ABI "_libcpp" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION)
 #    elif defined(__GXX_ABI_VERSION)
-#        if __GXX_ABI_VERSION >= 1002 && __GXX_ABI_VERSION < 2000
+#        if __GXX_ABI_VERSION >= 1002 && defined(_GLIBCXX_USE_CXX11_ABI)
-#            if !defined(_GLIBCXX_USE_CXX11_ABI)
-#                error "UNEXPECTED: _GLIBCXX_USE_CXX11_ABI not defined"
-#            endif
 #            define PYBIND11_BUILD_ABI                                                            \
-                "_gxx_abi_1xxx_usecxx11_" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_GLIBCXX_USE_CXX11_ABI)
+                "_usecxx11" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_GLIBCXX_USE_CXX11_ABI)
 #        else
 #            error "Unknown platform or compiler (__GXX_ABI_VERSION): PLEASE REVISE THIS CODE."
 #        endif