Skip to content

CDRIVER-6175 omit empty CXX= from handshake #2192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinAlbs merged 2 commits into from
Dec 17, 2025
+9 −1
Merged

CDRIVER-6175 omit empty CXX= from handshake #2192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3607470
CDRIVER-6175 omit empty `CXX=` from handshake
kevinAlbs Dec 15, 2025
6018997
support undefined `MONGOC_CXX_COMPILER` macros
kevinAlbs Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libmongoc/src/mongoc/mongoc-config-private.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
// clang-format off

// MONGOC_CXX_COMPILER_ID identifies the (optional) C++ compiler detected by CMake.
// Set to "" to if no check attempted.
// Set to "Unknown" if check attempted and no C++ compiler was found.
#define MONGOC_CXX_COMPILER_ID "@MONGOC_CXX_COMPILER_ID@"
#define MONGOC_CXX_COMPILER_VERSION "@MONGOC_CXX_COMPILER_VERSION@"

Expand Down
8 changes: 7 additions & 1 deletion src/libmongoc/src/mongoc/mongoc-handshake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,11 +491,17 @@ _set_compiler_info(mongoc_handshake_t *handshake)
mcommon_string_append_printf(&append, " %s", MONGOC_COMPILER_VERSION);
#endif

mcommon_string_append(&append, " CXX=" MONGOC_CXX_COMPILER_ID);
#ifdef MONGOC_CXX_COMPILER_ID
if (0 != strlen(MONGOC_CXX_COMPILER_ID)) {
Copy link
Contributor

@eramongodb eramongodb Dec 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prior code permitted MONGOC_CXX_COMPILER_ID to be undefined:

" CXX=" MONGOC_CXX_COMPILER_ID // -> " CXX="

This call to strlen() must either support a similar pattern:

if (0 != strlen("" MONGOC_CXX_COMPILER_ID)) { ... }

or be guarded by an ifdef:

#ifdef MONGOC_CXX_COMPILER_ID
   if (0 != strlen(MONGOC_CXX_COMPILER_ID)) { ... }
#endif

Copy link
Collaborator Author

@kevinAlbs kevinAlbs Dec 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated as suggested. I expect MONGOC_CXX_COMPILER_ID is always defined after configuring mongoc-config-private.h.in. But this might avoid the risk of breaking consumers if they bring-their-own mongoc-config-private.h.

MONGOC_CXX_COMPILER_VERSION is updated for consistency.

mcommon_string_append(&append, " CXX=" MONGOC_CXX_COMPILER_ID);
}
#endif

#ifdef MONGOC_CXX_COMPILER_VERSION
if (0 != strlen(MONGOC_CXX_COMPILER_VERSION)) {
mcommon_string_append(&append, " " MONGOC_CXX_COMPILER_VERSION);
}
#endif

handshake->compiler_info = mcommon_string_from_append_destroy_with_steal(&append);
}
Expand Down