kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Get rid of -Ofast on Linux

Browse source 
This seem to make some miscompilation that lead to hangs
This commit is contained in:
Ilya Fedin 2023-05-03 18:00:09 +04:00 • committed by John Preston
parent c03178c09b
commit d625b4d1ba
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
external/dispatch/CMakeLists.txt vendored
View file

@ -14,17 +14,11 @@ if (DESKTOP_APP_USE_PACKAGED)
endif() endif()
if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS) if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS)
if (DESKTOP_APP_SPECIAL_TARGET) if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_SPECIAL_TARGET)
set(dispatch_extra_args
-DCMAKE_BUILD_TYPE=None
"-DCMAKE_C_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
"-DCMAKE_CXX_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
)
elseif (NOT DESKTOP_APP_USE_PACKAGED)
set(dispatch_extra_args set(dispatch_extra_args
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
"-DCMAKE_C_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS" "-DCMAKE_C_FLAGS=-g -pipe -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
"-DCMAKE_CXX_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS" "-DCMAKE_CXX_FLAGS=-g -pipe -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
) )
elseif (DEFINED CMAKE_BUILD_TYPE) elseif (DEFINED CMAKE_BUILD_TYPE)
set(dispatch_extra_args set(dispatch_extra_args

4
external/jemalloc/CMakeLists.txt vendored
View file

@ -39,8 +39,8 @@ ExternalProject_Add(jemalloc
CONFIGURE_COMMAND env CONFIGURE_COMMAND env
CC=clang CC=clang
CXX=clang++ CXX=clang++
"$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>" "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CFLAGS=-fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
"$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CXXFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>" "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CXXFLAGS=-fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
./autogen.sh --disable-shared ./autogen.sh --disable-shared
BUILD_COMMAND make $<$<NOT:$<EQUAL:${N},0>>:-j${N}> BUILD_COMMAND make $<$<NOT:$<EQUAL:${N},0>>:-j${N}>
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1

1
options_linux.cmake
View file

@ -36,7 +36,6 @@ INTERFACE
if (DESKTOP_APP_SPECIAL_TARGET) if (DESKTOP_APP_SPECIAL_TARGET)
target_compile_options(common_options target_compile_options(common_options
INTERFACE INTERFACE
$<$<NOT:$<CONFIG:Debug>>:-Ofast>
-Werror -Werror
$<$<NOT:$<CONFIG:Debug>>:-g> $<$<NOT:$<CONFIG:Debug>>:-g>
$<$<NOT:$<CONFIG:Debug>>:-flto=auto> $<$<NOT:$<CONFIG:Debug>>:-flto=auto>