diff options
Diffstat (limited to 'xmake/rules/utils')
| -rw-r--r-- | xmake/rules/utils/inherit_links/inherit_links.lua | 6 | ||||
| -rw-r--r-- | xmake/rules/utils/merge_archive/xmake.lua | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/rules/utils/inherit_links/inherit_links.lua b/xmake/rules/utils/inherit_links/inherit_links.lua index 79c737503..4c38cf788 100644 --- a/xmake/rules/utils/inherit_links/inherit_links.lua +++ b/xmake/rules/utils/inherit_links/inherit_links.lua @@ -60,7 +60,7 @@ function main(target) -- rust maybe will disable inherit links, only inherit linkdirs if target:data("inherit.links.deplink") ~= false then - -- we need move target link to head + -- we need to move target link to head _add_export_value(target, "links", target:linkname()) local links = target:get("links", {rawref = true}) if links and type(links) == "table" and #links > 1 then @@ -71,14 +71,14 @@ function main(target) _add_export_value(target, "linkdirs", path.directory(targetfile)) if target:rule("go") then - -- we need add includedirs to support import modules for golang + -- we need to add includedirs to support import modules for golang _add_export_value(target, "includedirs", path.directory(targetfile)) end -- we export all links and linkdirs in self/packages/options to the parent target by default -- -- @note we only export links for static target, - -- and we need pass `{public = true}` to add_packages/add_links/... to export it if want to export links for shared target + -- and we need to pass `{public = true}` to add_packages/add_links/... to export it if want to export links for shared target -- if target:data("inherit.links.exportlinks") ~= false then if targetkind == "static" then diff --git a/xmake/rules/utils/merge_archive/xmake.lua b/xmake/rules/utils/merge_archive/xmake.lua index 6d58fe4f7..39c913804 100644 --- a/xmake/rules/utils/merge_archive/xmake.lua +++ b/xmake/rules/utils/merge_archive/xmake.lua @@ -21,7 +21,7 @@ rule("utils.merge.archive") set_extensions(".a", ".lib") after_load(function (target) - -- we need disable inherit links if all static deps have been merged + -- we need to disable inherit links if all static deps have been merged -- and we must disable it in after_load, because it will be called before rule(utils.inherit.links).on_config -- -- @see https://github.com/xmake-io/xmake/issues/3404 |