diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2016-06-18 21:10:02 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2017-09-08 15:16:29 +0200 |
| commit | e6a168b6c4332898e7df028da4f30bee4e01c0c1 (patch) | |
| tree | 989103fbdb81b135c28ff647b02dcfe79a737253 /build_settings.cmake | |
| parent | 092f8895ca6e7ee8007086355c2d27047cbd8923 (diff) | |
Limited port to Fedora 25 and Fedora 26.
Diffstat (limited to 'build_settings.cmake')
| -rw-r--r-- | build_settings.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index cb613688941..e6483785126 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -23,8 +23,14 @@ set(C_WARN_OPTS "-Winline -Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wc # Note: this is not a union of C_WARN_OPTS, since CMAKE_CXX_FLAGS already includes CMAKE_C_FLAGS, which in turn includes C_WARN_OPTS transitively set(CXX_SPECIFIC_WARN_OPTS "-Wsuggest-override -Wnon-virtual-dtor") +# Select C++ ABI +if(DEFINED VESPA_CXX_ABI_FLAGS) +else() +set (VESPA_CXX_ABI_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0") +endif() + # C and C++ compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${C_WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel ${EXTRA_C_FLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel ${EXTRA_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++1z -fvisibility-inlines-hidden -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") # Linker flags |