diff options
| author | ruki <[email protected]> | 2022-11-30 22:37:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-11-30 22:37:05 +0800 |
| commit | 8617fc332b913cc666b9f2afb20b2d61f6a79481 (patch) | |
| tree | c1f14efb39cab41996c01ec36965d94a735b543e | |
| parent | 6448706d37af25860c54e72e13ab0e68ce2b4dee (diff) | |
fix option configvar #discussions/3111
| -rw-r--r-- | xmake/actions/config/configfiles.lua | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/xmake/actions/config/configfiles.lua b/xmake/actions/config/configfiles.lua index 521984f8d..990df730a 100644 --- a/xmake/actions/config/configfiles.lua +++ b/xmake/actions/config/configfiles.lua @@ -179,17 +179,7 @@ function _generate_configfile(srcfile, dstfile, fileinfo, targets) for name, value in pairs(opt:get("configvar")) do if variables[name] == nil then variables[name] = table.unwrap(value) - variables["__extraconf_" .. name] = target:extraconf("configvar." .. name, value) - end - end - end - - -- get variables from the target.packages - for _, pkg in ipairs(target:orderpkgs()) do - for name, value in pairs(pkg:get("configvar")) do - if variables[name] == nil then - variables[name] = table.unwrap(value) - variables["__extraconf_" .. name] = target:extraconf("configvar." .. name, value) + variables["__extraconf_" .. name] = opt:extraconf("configvar." .. name, value) end end end |
