From 476c322fec2f2136b498229ec75b8f4b7a139bce Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Wed, 20 Nov 2024 19:44:36 -0500 Subject: [PATCH] Use `gxx_abi_1xxx` and simplify the Clang string After discussions with Ralf Grosse-Kunstleve we think these would make good identifiers that are concise and clear. --- include/pybind11/conduit/pybind11_platform_abi_id.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pybind11/conduit/pybind11_platform_abi_id.h b/include/pybind11/conduit/pybind11_platform_abi_id.h index 54c809753..9f173c91d 100644 --- a/include/pybind11/conduit/pybind11_platform_abi_id.h +++ b/include/pybind11/conduit/pybind11_platform_abi_id.h @@ -73,12 +73,12 @@ # 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 "_libcpp" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION) +# define PYBIND11_BUILD_ABI "_abi" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION) # elif defined(__GXX_ABI_VERSION) # if __GXX_ABI_VERSION >= 1002 && __GXX_ABI_VERSION < 2000 \ && defined(_GLIBCXX_USE_CXX11_ABI) # define PYBIND11_BUILD_ABI \ - "_gxx_abi_1_usecxx11_" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_GLIBCXX_USE_CXX11_ABI) + "_gxx_abi_1xxx_usecxx11_" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_GLIBCXX_USE_CXX11_ABI) # else # error "Unknown platform or compiler (__GXX_ABI_VERSION): PLEASE REVISE THIS CODE." # endif