[patch] relax ABI patch for gcc

relax-ABI.patch (text/plain), 1.17 KB, created by Brian Evans (RETIRED) on 2019-01-29 23:14:07 UTC

diff --git a/include/wx/build.h b/include/wx/build.h
index 473e0c9a6a..43f43cbf68 100644
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -52,8 +52,18 @@
 // GCC and Intel C++ share same C++ ABI (and possibly others in the future),
 // check if compiler versions are compatible:
 #if defined(__GXX_ABI_VERSION)
-    #define __WX_BO_COMPILER \
-            ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+    // All the changes since ABI version 1002 so far have been insignificant,
+    // so just check for this value, first used for g++ 3.4 and used by default
+    // by all g++ 4 versions, as checking for the exact ABI version simply
+    // results in run-time breakage whenever a new gcc version is released,
+    // even if there are no real problems.
+    #if __GXX_ABI_VERSION >= 1002
+        #define __WX_BO_COMPILER \
+                ",compiler with C++ ABI compatible with gcc 4"
+    #else
+        #define __WX_BO_COMPILER \
+                ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+    #endif
 #elif defined(__GNUG__)
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)