From 4c4a12cee7481a38ee2c66a61bb58ed643a48477 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 24 May 2024 17:19:27 +0100 Subject: [PATCH] fixup! cmake: Add `HARDENING` option Do not pass `-mbranch-protection=bti` during link stage. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8458ea7bd387..7bc124d9de805 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,7 +502,8 @@ if(ENABLE_HARDENING) try_append_linker_flag("/NXCOMPAT" TARGET hardening_interface) else() target_compile_options(hardening_interface INTERFACE - $<$>:-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3> + $<$>:-U_FORTIFY_SOURCE> + $<$>:-D_FORTIFY_SOURCE=3> ) try_append_cxx_flags("-Wstack-protector" TARGET hardening_interface SKIP_LINK) @@ -518,7 +519,7 @@ if(ENABLE_HARDENING) endif() if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - try_append_cxx_flags("-mbranch-protection=bti" TARGET hardening_interface) + try_append_cxx_flags("-mbranch-protection=bti" TARGET hardening_interface SKIP_LINK) endif() try_append_linker_flag("-Wl,--enable-reloc-section" TARGET hardening_interface)