Browse Source

Merge topic 'backport-determine-abi-fix' into release-4.0

41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10973
Brad King 3 months ago
parent
commit
a914434d52
1 changed files with 7 additions and 1 deletions
  1. 7 1
      Modules/CMakeCompilerABI.h

+ 7 - 1
Modules/CMakeCompilerABI.h

@@ -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