Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider g++ ABI up to 1010 to be compatible with 1002

Browse Source 
This is not completely true, but the changes in the versions 9 and 10 of g++
ABI don't (seem to?) affect wxWidgets, so allow using later versions of the
compiler for building the code using the libraries created using earlier ones.
This commit is contained in:
Vadim Zeitlin
2016-01-24 21:18:54 +01:00
parent a03df746f0
commit 96f5a24f6d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/build.h
View File

@@ -52,11 +52,11 @@
// GCC and Intel C++ share same C++ ABI (and possibly others in the future), // GCC and Intel C++ share same C++ ABI (and possibly others in the future),
// check if compiler versions are compatible: // check if compiler versions are compatible:
#if defined(__GXX_ABI_VERSION) #if defined(__GXX_ABI_VERSION)
// The changes between ABI versions 1002 through 1008 (documented at // The changes between ABI versions 1002 through 1010 (documented at
// https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html
// under -fabi-version) don't affect wxWidgets, so we allow a library // under -fabi-version) don't affect wxWidgets, so we allow a library
// and an application to differ within that range. // and an application to differ within that range.
#if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1008)) #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010))
#define wxGXX_EFFECTIVE_ABI_VERSION 1002 #define wxGXX_EFFECTIVE_ABI_VERSION 1002
#else #else
#define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION