]>
Commit | Line | Data |
---|---|---|
792fb8bd JB |
1 | --- mysql-5.7.27/cmake/build_configurations/compiler_options.cmake.orig 2019-06-10 16:43:20.000000000 +0200 |
2 | +++ mysql-5.7.27/cmake/build_configurations/compiler_options.cmake 2019-07-29 05:55:55.892824445 +0200 | |
3 | @@ -50,8 +50,8 @@ | |
4 | IF(C_NO_EXPENSIVE_OPTIMIZATIONS) | |
5 | SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations") | |
abe20e21 JB |
6 | ENDIF() |
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}") | |
11 | ENDIF() | |
12 | IF(CMAKE_COMPILER_IS_GNUCXX) | |
13 | SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") | |
792fb8bd JB |
14 | @@ -59,7 +59,7 @@ |
15 | EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion | |
16 | OUTPUT_VARIABLE GXX_VERSION) | |
17 | IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0) | |
18 | - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") | |
19 | + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11") | |
20 | ENDIF() | |
21 | # Disable inline optimizations for valgrind testing to avoid false positives | |
abe20e21 | 22 | IF(WITH_VALGRIND) |
792fb8bd JB |
23 | @@ -80,15 +80,15 @@ |
24 | IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS) | |
25 | SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations") | |
abe20e21 JB |
26 | ENDIF() |
27 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") | |
28 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") | |
29 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") | |
30 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") | |
31 | ENDIF() | |
32 | ||
33 | # Default Clang flags | |
34 | IF(CMAKE_C_COMPILER_ID MATCHES "Clang") | |
35 | SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") | |
36 | - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") | |
37 | - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") | |
38 | + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") | |
792fb8bd | 39 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") |
abe20e21 JB |
40 | ENDIF() |
41 | IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | |
42 | SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") | |
792fb8bd JB |
43 | @@ -95,11 +95,11 @@ |
44 | IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR | |
45 | CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) | |
46 | IF(CMAKE_SYSTEM_NAME MATCHES "Linux") | |
47 | - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") | |
48 | + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11") | |
49 | ENDIF() | |
50 | ENDIF() | |
abe20e21 JB |
51 | - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") |
52 | - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") | |
53 | + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") | |
54 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") | |
55 | ENDIF() | |
56 | ||
57 | # Solaris flags |