mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-01-26 19:09:06 +00:00
Merge topic 'backport-determine-abi-fix' into release-4.0
41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !10973
This commit is contained in:
commit
a914434d52
@ -40,6 +40,12 @@ static unsigned short const info_byte_order_little_endian[] = {
|
||||
# define ABI_ID "ELF"
|
||||
#endif
|
||||
|
||||
/* Construct the string literal in pieces to prevent the source from
|
||||
getting matched. Store it in a pointer rather than an array
|
||||
because some compilers will just produce instructions to fill the
|
||||
array rather than assigning a pointer to a static array. */
|
||||
#if defined(ABI_ID)
|
||||
static char const info_abi[] = "INFO:abi[" ABI_ID "]";
|
||||
static char const* info_abi = "INFO"
|
||||
":"
|
||||
"abi[" ABI_ID "]";
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user