Skip to content

Commit 471e26a

Browse files
committed
fixup! cmake: Add HARDENING option
1 parent 122ab27 commit 471e26a

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

CMakeLists.txt

+12-9
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,19 @@ if(HARDENING)
250250
$<$<NOT:$<CONFIG:Debug>>:-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3>
251251
)
252252

253-
try_append_cxx_flags("-Wstack-protector" TARGET hardening)
254-
try_append_cxx_flags("-fstack-protector-all" TARGET hardening)
255253
try_append_cxx_flags("-fcf-protection=full" TARGET hardening)
254+
try_append_cxx_flags("-fstack-protector-all" TARGET hardening)
255+
try_append_cxx_flags("-Wstack-protector" TARGET hardening)
256+
257+
try_append_linker_flag("-fstack-protector-all" TARGET hardening)
258+
259+
try_append_linker_flag("-Wl,--enable-reloc-section" TARGET hardening)
260+
try_append_linker_flag("-Wl,--dynamicbase" TARGET hardening)
261+
try_append_linker_flag("-Wl,--nxcompat" TARGET hardening)
262+
try_append_linker_flag("-Wl,--high-entropy-va" TARGET hardening)
263+
try_append_linker_flag("-Wl,-z,relro" TARGET hardening)
264+
try_append_linker_flag("-Wl,-z,now" TARGET hardening)
265+
try_append_linker_flag("-Wl,-z,separate-code" TARGET hardening)
256266

257267
if(MINGW)
258268
# stack-clash-protection doesn't compile with GCC 10 and earlier.
@@ -266,13 +276,6 @@ if(HARDENING)
266276
try_append_cxx_flags("-mbranch-protection=bti" TARGET hardening)
267277
endif()
268278

269-
try_append_linker_flag("-Wl,--enable-reloc-section" TARGET hardening)
270-
try_append_linker_flag("-Wl,--dynamicbase" TARGET hardening)
271-
try_append_linker_flag("-Wl,--nxcompat" TARGET hardening)
272-
try_append_linker_flag("-Wl,--high-entropy-va" TARGET hardening)
273-
try_append_linker_flag("-Wl,-z,relro" TARGET hardening)
274-
try_append_linker_flag("-Wl,-z,now" TARGET hardening)
275-
try_append_linker_flag("-Wl,-z,separate-code" TARGET hardening)
276279
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
277280
try_append_linker_flag("-Wl,-bind_at_load" TARGET hardening)
278281
try_append_linker_flag("-Wl,-fixup_chains" TARGET hardening)

0 commit comments

Comments
 (0)