From d2da2792f328eca7cd527f2f878fa91fac307ee3 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Jan 2026 00:38:19 +0800 Subject: fix get flag in module support --- xmake/rules/c++/modules/msvc/support.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/rules/c++/modules/msvc/support.lua') diff --git a/xmake/rules/c++/modules/msvc/support.lua b/xmake/rules/c++/modules/msvc/support.lua index 1f066de43..98e6a56c9 100644 --- a/xmake/rules/c++/modules/msvc/support.lua +++ b/xmake/rules/c++/modules/msvc/support.lua @@ -261,7 +261,7 @@ function get_cppversionflag(target) if cppversionflag == nil then local compinst = target:compiler("cxx") local flags = compinst:compflags({target = target}) - cppversionflag = table.find_if(flags, function(v) string.startswith(v, "/std:c++") end) or "/std:c++latest" + cppversionflag = table.find_if(flags, function(v) return string.startswith(v, "/std:c++") end) or "/std:c++latest" end return cppversionflag or nil end -- cgit v1.3.1 From 87da1fada35ab075104a5b7bc855a0ced986ca10 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Jan 2026 00:46:08 +0800 Subject: fix get flag again --- xmake/rules/c++/modules/gcc/support.lua | 3 ++- xmake/rules/c++/modules/msvc/support.lua | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'xmake/rules/c++/modules/msvc/support.lua') diff --git a/xmake/rules/c++/modules/gcc/support.lua b/xmake/rules/c++/modules/gcc/support.lua index e4e598107..623444ce4 100644 --- a/xmake/rules/c++/modules/gcc/support.lua +++ b/xmake/rules/c++/modules/gcc/support.lua @@ -311,7 +311,8 @@ function get_cppversionflag(target) if cppversionflag == nil then local compinst = target:compiler("cxx") local flags = compinst:compflags({target = target}) - cppversionflag = table.find_if(flags, function(v) return string.startswith(v, "-std=c++") end) or "-std=c++20" + local idx = table.find_first_if(flags, function(_, v) return string.startswith(v, "-std=c++") end) + cppversionflag = (idx and flags[idx]) or "-std=c++20" _g.cppversionflag = cppversionflag end return cppversionflag or nil diff --git a/xmake/rules/c++/modules/msvc/support.lua b/xmake/rules/c++/modules/msvc/support.lua index 98e6a56c9..588921d0e 100644 --- a/xmake/rules/c++/modules/msvc/support.lua +++ b/xmake/rules/c++/modules/msvc/support.lua @@ -261,7 +261,9 @@ function get_cppversionflag(target) if cppversionflag == nil then local compinst = target:compiler("cxx") local flags = compinst:compflags({target = target}) - cppversionflag = table.find_if(flags, function(v) return string.startswith(v, "/std:c++") end) or "/std:c++latest" + local idx = table.find_first_if(flags, function(_, v) return string.startswith(v, "/std:c++") end) + cppversionflag = (idx and flags[idx]) or "/std:c++latest" + _g.cppversionflag = cppversionflag end return cppversionflag or nil end -- cgit v1.3.1