| 1 |
--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC |
| 2 |
+++ cmake/build_configurations/compiler_options.cmake |
| 3 |
@@ -29,7 +29,7 @@ IF(UNIX) |
| 4 |
|
| 5 |
# Default GCC flags |
| 6 |
IF(CMAKE_COMPILER_IS_GNUCC) |
| 7 |
- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") |
| 8 |
+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") |
| 9 |
# Disable inline optimizations for valgrind testing to avoid false positives |
| 10 |
IF(WITH_VALGRIND) |
| 11 |
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") |
| 12 |
@@ -42,7 +42,7 @@ IF(UNIX) |
| 13 |
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") |
| 14 |
ENDIF() |
| 15 |
IF(CMAKE_COMPILER_IS_GNUCXX) |
| 16 |
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") |
| 17 |
+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") |
| 18 |
# GCC 6 has C++14 as default, set it explicitly to the old default. |
| 19 |
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion |
| 20 |
OUTPUT_VARIABLE GXX_VERSION) |
