summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2024-08-04 18:10:10 +0200
committerArthur LAURENT <[email protected]>2024-10-08 13:47:43 +0200
commitad7371e54e67376b4b4c11ae16a0020f0d0f6a1c (patch)
tree3164f4358e783c4b34e1f63c234ffbac9d25adfa
parent3fc650750d19020568c17aa2d5540e48faf92d63 (diff)
cleanup unused variables
-rw-r--r--xmake/rules/c++/modules/modules_support/clang/builder.lua4
-rw-r--r--xmake/rules/c++/modules/modules_support/dependency_scanner.lua2
-rw-r--r--xmake/rules/c++/modules/modules_support/msvc/builder.lua4
3 files changed, 5 insertions, 5 deletions
diff --git a/xmake/rules/c++/modules/modules_support/clang/builder.lua b/xmake/rules/c++/modules/modules_support/clang/builder.lua
index 91534a11e..8981911bd 100644
--- a/xmake/rules/c++/modules/modules_support/clang/builder.lua
+++ b/xmake/rules/c++/modules/modules_support/clang/builder.lua
@@ -125,7 +125,7 @@ function _get_requiresflags(target, module, opt)
local requiresflags = compiler_support.memcache():get2(cachekey, "requiresflags")
or compiler_support.localcache():get2(cachekey, "requiresflags")
- if not requiresflags or (opt and opt.regenerate) then
+ if not requiresflags then
requiresflags = {}
for required, _ in table.orderpairs(module.requires) do
local dep_module = get_from_target_mapper(target, required)
@@ -154,7 +154,7 @@ end
function _append_requires_flags(target, module, name, cppfile, bmifile, opt)
local cxxflags = {}
- local requiresflags = _get_requiresflags(target, {name = (name or cppfile), bmi = bmifile, requires = module.requires}, {regenerate = opt.build})
+ local requiresflags = _get_requiresflags(target, {name = (name or cppfile), bmi = bmifile, requires = module.requires})
for _, flag in ipairs(requiresflags) do
-- we need to wrap flag to support flag with space
if type(flag) == "string" and flag:find(" ", 1, true) then
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
index c8da6793a..3287628ef 100644
--- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
@@ -237,7 +237,7 @@ end
function get_module_dependencies(target, sourcebatch, opt)
local cachekey = target:name() .. "/" .. sourcebatch.rulename
local modules = compiler_support.memcache():get2("modules", cachekey)
- if modules == nil or opt.regenerate then
+ if modules == nil then
modules = compiler_support.localcache():get2("modules", cachekey)
opt.progress = opt.progress or 0
local changed = _generate_dependencies(target, sourcebatch, opt)
diff --git a/xmake/rules/c++/modules/modules_support/msvc/builder.lua b/xmake/rules/c++/modules/modules_support/msvc/builder.lua
index 89d9b6b60..2d17d2a39 100644
--- a/xmake/rules/c++/modules/modules_support/msvc/builder.lua
+++ b/xmake/rules/c++/modules/modules_support/msvc/builder.lua
@@ -171,7 +171,7 @@ function _get_requiresflags(target, module, opt)
local requiresflags = compiler_support.memcache():get2(cachekey, "requiresflags")
or compiler_support.localcache():get2(cachekey, "requiresflags")
- if not requiresflags or (opt and opt.regenerate) then
+ if not requiresflags then
local deps_flags = {}
for required, _ in table.orderpairs(module.requires) do
local dep_module = get_from_target_mapper(target, required)
@@ -219,7 +219,7 @@ end
function _append_requires_flags(target, module, name, cppfile, bmifile, opt)
local cxxflags = {}
- local requiresflags = _get_requiresflags(target, {name = (name or cppfile), bmi = bmifile, requires = module.requires}, {regenerate = opt.build})
+ local requiresflags = _get_requiresflags(target, {name = (name or cppfile), bmi = bmifile, requires = module.requires})
for _, flag in ipairs(requiresflags) do
-- we need to wrap flag to support flag with space
if type(flag) == "string" and flag:find(" ", 1, true) then