Skip to content

Commit d412303

Browse files
committed
Fix oversight: remove __NVCOMPILER elif branch in PYBIND11_BUILD_ABI block.
Also add comment pointing to this PR (#5439).
1 parent 9fc9515 commit d412303

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

include/pybind11/conduit/pybind11_platform_abi_id.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,9 @@
6464
# error "Unknown major version for MSC_VER: PLEASE REVISE THIS CODE."
6565
# endif
6666
# endif
67-
# elif defined(__NVCOMPILER) // NVHPC (PGI-based).
68-
# define PYBIND11_BUILD_ABI "" // TODO: What should be here, to prevent UB?
6967
# elif defined(_LIBCPP_ABI_VERSION) // https://libcxx.llvm.org/DesignDocs/ABIVersioning.html
7068
# define PYBIND11_BUILD_ABI "_abi" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION)
71-
# elif defined(__GXX_ABI_VERSION)
69+
# elif defined(__GXX_ABI_VERSION) // See PR #5439.
7270
# if __GXX_ABI_VERSION >= 1002 && __GXX_ABI_VERSION < 2000
7371
# if !defined(_GLIBCXX_USE_CXX11_ABI)
7472
# error "UNEXPECTED: _GLIBCXX_USE_CXX11_ABI not defined: PLEASE REVISE THIS CODE."

0 commit comments

Comments
 (0)