]>
Commit | Line | Data |
---|---|---|
cbfddd83 ER |
1 | --- percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake~ 2016-06-19 22:55:34.000000000 +0300 |
2 | +++ percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake 2016-06-19 22:58:00.531159698 +0300 | |
3 | @@ -33,8 +33,8 @@ | |
abe20e21 JB |
4 | IF(WITH_VALGRIND) |
5 | SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") | |
6 | ENDIF() | |
7 | - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") | |
cbfddd83 | 8 | - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}") |
abe20e21 | 9 | + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") |
cbfddd83 | 10 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") |
abe20e21 JB |
11 | ENDIF() |
12 | IF(CMAKE_COMPILER_IS_GNUCXX) | |
13 | SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") | |
cbfddd83 | 14 | @@ -42,20 +42,20 @@ |
abe20e21 JB |
15 | IF(WITH_VALGRIND) |
16 | SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") | |
17 | ENDIF() | |
18 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") | |
cbfddd83 | 19 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}") |
abe20e21 | 20 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") |
cbfddd83 | 21 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") |
abe20e21 JB |
22 | ENDIF() |
23 | ||
24 | # Default Clang 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}") | |
cbfddd83 | 28 | - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}") |
abe20e21 | 29 | + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") |
cbfddd83 | 30 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") |
abe20e21 JB |
31 | ENDIF() |
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}") | |
cbfddd83 | 35 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}") |
abe20e21 | 36 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") |
cbfddd83 | 37 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") |
abe20e21 JB |
38 | ENDIF() |
39 | ||
40 | # Solaris flags | |
a1a9dfeb | 41 |