From 03f949dcf8d4060f66b1f91a1ff314a4dc7262f3 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 20 Mar 2024 11:32:44 +0100 Subject: [PATCH] Fix the command line options for the hardening features Make them take dash-separated names, not underscore-separated ones. Amends 9ff1e6d80b. Change-Id: Ia6af2ef4b422dba74acb4ea835e70045d5f53215 Reviewed-by: Alexandru Croitor --- qt_cmdline.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index a01ad054c42..06683624ef8 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -76,13 +76,13 @@ qt_commandline_option(openssl-runtime TYPE void NAME openssl VALUE runtime) qt_commandline_option(linker TYPE optionalString VALUES bfd gold lld mold) qt_commandline_option(ltcg TYPE boolean) qt_commandline_option(intelcet TYPE boolean) -qt_commandline_option(glibc_fortify_source TYPE boolean) -qt_commandline_option(trivial_auto_var_init_pattern TYPE boolean) -qt_commandline_option(stack_protector TYPE boolean) -qt_commandline_option(stack_clash_protection TYPE boolean) -qt_commandline_option(libstdcpp_assertions TYPE boolean) -qt_commandline_option(libcpp_hardening TYPE boolean) -qt_commandline_option(relro_now_linker TYPE boolean) +qt_commandline_option(glibc-fortify-source TYPE boolean NAME glibc_fortify_source) +qt_commandline_option(trivial-auto-var-init-pattern TYPE boolean NAME trivial_auto_var_init_pattern) +qt_commandline_option(stack-protector TYPE boolean NAME stack_protector) +qt_commandline_option(stack-clash-protection TYPE boolean NAME stack_clash_protection) +qt_commandline_option(libstdcpp-assertions TYPE boolean NAME libstdcpp_assertions) +qt_commandline_option(libcpp-hardening TYPE boolean NAME libcpp_hardening) +qt_commandline_option(relro-now-linker TYPE boolean NAME relro_now_linker) qt_commandline_option(make TYPE addString VALUES examples libs tests tools benchmarks manual-tests minimal-static-tests) qt_commandline_option(install-examples-sources TYPE boolean)