[libc++][hardening] Check that _LIBCPP_HARDENING_MODE_DEFAULT is defined
#80353
Conversation
…fined If the `_LIBCPP_HARDENING_MODE_DEFAULT` macro is not defined, `_LIBCPP_HARDENING_MODE` will be considered defined but fail the check for a valid hardening mode, resulting in a slightly less understandable error (that error is really meant more to prevent users from passing incorrect values such as `0` or `1` directly rather than catching configuration issues).
var-const
added
libc++
|
@llvm/pr-subscribers-libcxx Author: Konstantin Varlamov (var-const) ChangesIf the Full diff: https://github.com/llvm/llvm-project/pull/80353.diff 1 Files Affected:
diff --git a/libcxx/include/__config b/libcxx/include/__config
index d356960e9e62b..2101490c3a8c5 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -325,6 +325,11 @@
// clang-format on
# ifndef _LIBCPP_HARDENING_MODE
+
+# ifndef _LIBCPP_HARDENING_MODE_DEFAULT
+# error _LIBCPP_HARDENING_MODE_DEFAULT is not defined.
+# endif
+
# define _LIBCPP_HARDENING_MODE _LIBCPP_HARDENING_MODE_DEFAULT
# endif
|
libcxx/include/__config
Outdated
| @@ -325,6 +325,11 @@ | |||
| // clang-format on | |||
|
|
|||
| # ifndef _LIBCPP_HARDENING_MODE | |||
|
|
|||
| # ifndef _LIBCPP_HARDENING_MODE_DEFAULT | |||
| # error _LIBCPP_HARDENING_MODE_DEFAULT is not defined. | |||
There was a problem hiding this comment.
Do we want to speculate in the comment as to why that might be the case? E.g.
// Normally this macro comes from the `__config_site` header which is generated via CMake.
// If you use a custom build system, please make sure to define `_LIBCPP_HARDENING_MODE_DEFAULT`
// to one of the valid hardening modes.
There was a problem hiding this comment.
I would say something like This definition should be set at configuration-time in the __config_site header, please ensure your installation of libc++ is not broken -- or something like that. WDYT?
If the
_LIBCPP_HARDENING_MODE_DEFAULTmacro is not defined,_LIBCPP_HARDENING_MODEwill be considered defined but fail the check for a valid hardening mode, resulting in a slightly less understandable error (that error is really meant more to prevent users from passing incorrect values such as0or1directly rather than catching configuration issues).