diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:53:39 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:53:39 -0300 |
| commit | 7f87c8f0997af4b8d5ee9c7d07a362e60aaa2b99 (patch) | |
| tree | 6c4ed955e3681ba52cf34ec5d1e37ec4f3c3ed2e /cmake/abi_check.cmake | |
| parent | 70822d52ada9a81542b799dd238bf9db4771f7c4 (diff) | |
| download | mariadb-git-7f87c8f0997af4b8d5ee9c7d07a362e60aaa2b99.tar.gz | |
Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
due to GCC preprocessor change
Addendum for trunk: add -DMYSQL_ABI_CHECK to the cmake ABI check.
Diffstat (limited to 'cmake/abi_check.cmake')
| -rw-r--r-- | cmake/abi_check.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake index 0d5bf21f540..7911b7848a8 100644 --- a/cmake/abi_check.cmake +++ b/cmake/abi_check.cmake @@ -38,7 +38,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux") -DCOMPILER=${COMPILER} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} - "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}" + "-DDMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}" -P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake VERBATIM ) @@ -48,7 +48,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux") -DCMAKE_C_COMPILER=${COMPILER} -DCMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} - "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}" + "-DMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}" -P ${CMAKE_SOURCE_DIR}/cmake/scripts/do_abi_check.cmake VERBATIM ) |