1 --- percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake.orig 2015-05-06 12:38:47.000000000 +0200
2 +++ percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake 2015-06-09 19:54:42.577790251 +0200
5 SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
7 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
8 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
9 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
10 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
12 IF(CMAKE_COMPILER_IS_GNUCXX)
13 SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
16 SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
18 - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
19 - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
20 + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
21 + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
25 IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
26 SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
27 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
28 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
29 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
30 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
32 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
33 SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
34 - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
35 - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
36 + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
37 + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")