Skip to content

Commit 8617fc3

Browse files
committedNov 30, 2022
fix option configvar #discussions/3111
1 parent 6448706 commit 8617fc3

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed
 

‎xmake/actions/config/configfiles.lua

+1-11
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,7 @@ function _generate_configfile(srcfile, dstfile, fileinfo, targets)
179179
for name, value in pairs(opt:get("configvar")) do
180180
if variables[name] == nil then
181181
variables[name] = table.unwrap(value)
182-
variables["__extraconf_" .. name] = target:extraconf("configvar." .. name, value)
183-
end
184-
end
185-
end
186-
187-
-- get variables from the target.packages
188-
for _, pkg in ipairs(target:orderpkgs()) do
189-
for name, value in pairs(pkg:get("configvar")) do
190-
if variables[name] == nil then
191-
variables[name] = table.unwrap(value)
192-
variables["__extraconf_" .. name] = target:extraconf("configvar." .. name, value)
182+
variables["__extraconf_" .. name] = opt:extraconf("configvar." .. name, value)
193183
end
194184
end
195185
end

0 commit comments

Comments
 (0)
Please sign in to comment.