diff options
| -rw-r--r-- | xmake/core/base/scopeinfo.lua | 2 | ||||
| -rw-r--r-- | xmake/core/package/package.lua | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xmake/core/base/scopeinfo.lua b/xmake/core/base/scopeinfo.lua index 359bcba9e..cdc43c4bc 100644 --- a/xmake/core/base/scopeinfo.lua +++ b/xmake/core/base/scopeinfo.lua @@ -130,7 +130,7 @@ function _instance:_api_set_values(name, ...) local handled_values = self:_api_handle(name, values) -- save values - if type(handled_values) == "table" and #handled_values == 0 then + if type(handled_values) == "table" and table.empty(handled_values) then -- set("xx", nil)? remove it scope[name] = nil else diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index b3d7fa35d..2df0adf72 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -295,7 +295,10 @@ function _instance:artifacts_set(artifacts_info) local versions = self:get("versions") if versions then -- backup previous package configuration - self._ARTIFACTS_BACKUP = {urls = table.copy(self:urls()), versions = table.copy(versions), install = self:get("install")} + self._ARTIFACTS_BACKUP = { + urls = table.copy(self:urls()), + versions = table.copy(versions), + install = self:script("install")} -- self:get() will get a table, it will be broken when call self:set() -- we switch to urls of the precompiled artifacts self:urls_set(table.wrap(artifacts_info.urls)) |