diff options
| author | ruki <[email protected]> | 2020-11-07 20:30:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-11-07 20:30:46 +0800 |
| commit | d9de1aa6e08b684646c693dc4530fb5dc0d499a9 (patch) | |
| tree | 0d985dcd7b115879eddd322f7fd9838b3636bb98 /xmake/modules | |
| parent | ba62268d4a1cd7db9e66f52e08a393eb6cc2df90 (diff) | |
fix package/deps envs
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/target/action/install/windows.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/target/action/uninstall/windows.lua | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/xmake/modules/target/action/install/windows.lua b/xmake/modules/target/action/install/windows.lua index 7e9f6ab0b..0ffb2bd82 100644 --- a/xmake/modules/target/action/install/windows.lua +++ b/xmake/modules/target/action/install/windows.lua @@ -55,9 +55,7 @@ function _install_shared_for_packages(target, outputdir) _g.installed_packages = _g.installed_packages or {} for _, pkg in ipairs(target:orderpkgs()) do if not _g.installed_packages[pkg:name()] then - local extrainfo = pkg:extrainfo() or {} - local has_shared = extrainfo.configs and extrainfo.configs.shared - if has_shared and pkg:enabled() and pkg:get("libfiles") then + if pkg:enabled() and pkg:get("libfiles") then _install_shared_for_package(target, pkg, outputdir) end _g.installed_packages[pkg:name()] = true diff --git a/xmake/modules/target/action/uninstall/windows.lua b/xmake/modules/target/action/uninstall/windows.lua index d4ddf88a2..2d686dacc 100644 --- a/xmake/modules/target/action/uninstall/windows.lua +++ b/xmake/modules/target/action/uninstall/windows.lua @@ -41,9 +41,7 @@ function _uninstall_shared_for_packages(target, outputdir) _g.uninstalled_packages = _g.uninstalled_packages or {} for _, pkg in ipairs(target:orderpkgs()) do if not _g.uninstalled_packages[pkg:name()] then - local extrainfo = pkg:extrainfo() or {} - local has_shared = extrainfo.configs and extrainfo.configs.shared - if has_shared and pkg:enabled() and pkg:get("libfiles") then + if pkg:enabled() and pkg:get("libfiles") then _uninstall_shared_for_package(target, pkg, outputdir) end _g.uninstalled_packages[pkg:name()] = true |