Skip to content

Commit 36e9796

Browse files
committed
cmake: simplify the Saigo arm optimization disablement fix
1 parent 7d74207 commit 36e9796

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

cmake/DaemonFlags.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,12 @@ else()
363363
endif()
364364

365365
if (NACL AND USE_NACL_SAIGO AND SAIGO_ARCH STREQUAL "arm")
366-
# This should be set for every build type because build type flags
367-
# are set after the other custom flags and then have the last word.
368-
# DEBUG should already use -O0 anyway.
366+
# Saigo produces broken arm builds when optimizing them.
369367
# See: https://github.com/Unvanquished/Unvanquished/issues/3297
370-
set_c_cxx_flag("-O0" DEBUG)
371-
set_c_cxx_flag("-O0" RELEASE)
372-
set_c_cxx_flag("-O0" RELWITHDEBINFO)
373-
set_c_cxx_flag("-O0" MINSIZEREL)
368+
# When setting this clang-specific option, we don't have to care
369+
# about the ordering of -O options that may be introduced,
370+
# all -O options added to the command line are ignored.
371+
set_c_cxx_flag("-Xclang -disable-llvm-passes")
374372
endif()
375373

376374
# Extra debug flags.

0 commit comments

Comments
 (0)