From 9633e0162bebbb097de9e2e6105eeee389497af5 Mon Sep 17 00:00:00 2001 From: Tue Ly Date: Sun, 10 Mar 2024 22:06:05 -0400 Subject: [PATCH] [libc] Fix flag parsing bugs. --- libc/cmake/modules/LLVMLibCCompileOptionRules.cmake | 6 +++--- libc/cmake/modules/LLVMLibCFlagRules.cmake | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake b/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake index 72b04822d8b84..893a807b5b61c 100644 --- a/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake +++ b/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake @@ -2,10 +2,10 @@ function(_get_compile_options_from_flags output_var) set(compile_options "") if(LIBC_TARGET_ARCHITECTURE_IS_RISCV64 OR(LIBC_CPU_FEATURES MATCHES "FMA")) - check_flag(ADD_FMA_FLAG ${FMA_OPT_FLAG} ${flags}) + check_flag(ADD_FMA_FLAG ${FMA_OPT_FLAG} ${ARGN}) endif() - check_flag(ADD_SSE4_2_FLAG ${ROUND_OPT_FLAG} ${flags}) - check_flag(ADD_EXPLICIT_SIMD_OPT_FLAG ${EXPLICIT_SIMD_OPT_FLAG} ${flags}) + check_flag(ADD_SSE4_2_FLAG ${ROUND_OPT_FLAG} ${ARGN}) + check_flag(ADD_EXPLICIT_SIMD_OPT_FLAG ${EXPLICIT_SIMD_OPT_FLAG} ${ARGN}) if(LLVM_COMPILER_IS_GCC_COMPATIBLE) if(ADD_FMA_FLAG) diff --git a/libc/cmake/modules/LLVMLibCFlagRules.cmake b/libc/cmake/modules/LLVMLibCFlagRules.cmake index 9bec716516f28..18e36dfde5cc1 100644 --- a/libc/cmake/modules/LLVMLibCFlagRules.cmake +++ b/libc/cmake/modules/LLVMLibCFlagRules.cmake @@ -131,9 +131,9 @@ endfunction(get_fq_dep_list_without_flag) # Check if a `flag` is set function(check_flag result flag_name) - list(FIND ARGN ${flag_name}_FLAG has_flag) + list(FIND ARGN ${flag_name} has_flag) if(${has_flag} LESS 0) - list(FIND ARGN "${flag_name}_FLAG__ONLY" has_flag) + list(FIND ARGN "${flag_name}__ONLY" has_flag) endif() if(${has_flag} GREATER -1) set(${result} TRUE PARENT_SCOPE)