Skip to content

refactor(cmake): ♻️ query machine flags from ARCH_FLAG itself #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robertodr wants to merge 3 commits into from
Open

refactor(cmake): ♻️ query machine flags from ARCH_FLAG itself #304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39f6fa3
refactor(cmake): ♻️ query machine flags from ARCH_FLAG itself
Aug 29, 2026
9524150
Merge branch 'main' into split/03-arch-flags
robertodr Aug 29, 2026
aa38399
Merge branch 'main' into split/03-arch-flags
robertodr Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 18 additions & 26 deletions cmake/compiler_flags/CXXFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,41 +81,33 @@ if(monoprop_ENABLE_ARCH_FLAGS)
endif()
endif()

# Query the machine-dependent flags for a given -march value and store the
# cleaned, space-separated string in the variable named by OUTPUT_VARIABLE. A
# MARCH of "default" queries the default target (no -march flag).
# Query the machine-dependent flags the compiler applies under a given architecture selection and
# store the cleaned, space-separated string in the variable named by OUTPUT_VARIABLE.
#
# Usage:
# _monoprop_query_machine_flags(MARCH <arch> OUTPUT_VARIABLE <var>)
# _monoprop_query_machine_flags(ARCH_FLAGS <flags...> OUTPUT_VARIABLE <var>)
function(_monoprop_query_machine_flags)
set(
_one_value_args
MARCH
OUTPUT_VARIABLE
)
cmake_parse_arguments(PARSE_ARGV 0 _arg "" "${_one_value_args}" "")
cmake_parse_arguments(PARSE_ARGV 0 _arg "" "OUTPUT_VARIABLE" "ARCH_FLAGS")

if(NOT _arg_OUTPUT_VARIABLE)
message(
FATAL_ERROR
"_monoprop_query_machine_flags: OUTPUT_VARIABLE is required"
)
endif()
if(NOT _arg_MARCH)
message(FATAL_ERROR "_monoprop_query_machine_flags: MARCH is required")
endif()

if(_arg_MARCH STREQUAL "default")
set(_march_args "")
set(_arch_args ${_arg_ARCH_FLAGS})
if(_arch_args)
string(JOIN " " _arch_label ${_arch_args})
else()
set(_march_args "-march=${_arg_MARCH}")
set(_arch_label "the default target")
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
execute_process(
COMMAND
# gersemi: off
${CMAKE_CXX_COMPILER} ${_march_args} -\#\#\# -x c++ -c /dev/null
${CMAKE_CXX_COMPILER} ${_arch_args} -\#\#\# -x c++ -c /dev/null
# gersemi: on
ERROR_VARIABLE _query_output
ERROR_STRIP_TRAILING_WHITESPACE
Expand All @@ -124,7 +116,7 @@ function(_monoprop_query_machine_flags)
if(NOT _query_result EQUAL 0)
message(
WARNING
"Failed to query machine-dependent flags for '${_arg_MARCH}' with AppleClang (exit code ${_query_result}). Continuing with empty machine flags."
"Failed to query machine-dependent flags for ${_arch_label} with AppleClang (exit code ${_query_result}). Continuing with empty machine flags."
)
set(_flags "")
else()
Expand All @@ -141,15 +133,15 @@ function(_monoprop_query_machine_flags)
if(NOT _parse_result EQUAL 0)
message(
WARNING
"Failed to parse AppleClang machine-dependent flags for '${_arg_MARCH}' (exit code ${_parse_result}). Continuing with empty machine flags."
"Failed to parse AppleClang machine-dependent flags for ${_arch_label} (exit code ${_parse_result}). Continuing with empty machine flags."
)
set(_flags "")
endif()
endif()
else()
execute_process(
COMMAND
${CMAKE_CXX_COMPILER} ${_march_args} -Q --help=target
${CMAKE_CXX_COMPILER} ${_arch_args} -Q --help=target
COMMAND
${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/tools/target-help-clean.py"
--mode gcc
Expand All @@ -160,19 +152,19 @@ function(_monoprop_query_machine_flags)
if(NOT _result EQUAL 0)
message(
FATAL_ERROR
"Failed to query machine-dependent flags for '${_arg_MARCH}' (exit code ${_result})"
"Failed to query machine-dependent flags for ${_arch_label} (exit code ${_result})"
)
endif()
endif()
set(${_arg_OUTPUT_VARIABLE} "${_flags}" PARENT_SCOPE)
endfunction()

# Empty is the no-arch-flag build and queries the default target.
set(monoprop_DEFAULT_VARIANT_FLAGS "")
if(monoprop_ENABLE_ARCH_FLAGS)
_monoprop_query_machine_flags(MARCH native OUTPUT_VARIABLE monoprop_DEFAULT_VARIANT_FLAGS)
else()
_monoprop_query_machine_flags(MARCH default OUTPUT_VARIABLE monoprop_DEFAULT_VARIANT_FLAGS)
endif()
_monoprop_query_machine_flags(
ARCH_FLAGS ${ARCH_FLAG}
OUTPUT_VARIABLE monoprop_DEFAULT_VARIANT_FLAGS
)

set(monoprop_VARIANTS "")
set(monoprop_VARIANT_FLAGS "")
Expand Down
Loading