diff options
| author | SineStriker <[email protected]> | 2025-04-20 05:07:38 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-04-23 11:30:30 +0800 |
| commit | d57cceb19f58b99d5198cea0c32ec306ea22a9fb (patch) | |
| tree | 74f5b5cd3f707887b35fea49e6621dd1ee5b34d7 /xmake/core/tool | |
| parent | cef17b4c566a186ba8e9dd3dc52ab44901fed9f1 (diff) | |
Add `set_implibdir` to target APIs
Diffstat (limited to 'xmake/core/tool')
| -rw-r--r-- | xmake/core/tool/linker.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmake/core/tool/linker.lua b/xmake/core/tool/linker.lua index 451c0ac7e..a0ae27641 100644 --- a/xmake/core/tool/linker.lua +++ b/xmake/core/tool/linker.lua @@ -68,14 +68,14 @@ function linker:_add_flags_from_linker(flags) end -- add implib-dir to the options -function linker:_add_implibdir_to_options(opt) +function linker:_add_implib_to_options(opt) opt = opt or {} - if not opt.implibdir then + if not opt.implib then local target = self:target() if target:type() == "target" then - local implibdir = target:implibdir() - if implibdir then - opt.implibdir = implibdir + local impblibfile = target:implibfile() + if impblibfile then + opt.implib = impblibfile end end end @@ -244,7 +244,7 @@ function linker:link(objectfiles, targetfile, opt) opt = table.copy(opt) opt.target = self:target() - opt = self:_add_implibdir_to_options(opt) + opt = self:_add_implib_to_options(opt) profiler:enter(self:name(), "link", targetfile) local ok, errors = sandbox.load(self:_tool().link, self:_tool(), table.wrap(objectfiles), self:_targetkind(), targetfile, linkflags, opt) @@ -254,13 +254,13 @@ end -- get the link arguments list function linker:linkargv(objectfiles, targetfile, opt) - opt = self:_add_implibdir_to_options(opt) + opt = self:_add_implib_to_options(opt) return self:_tool():linkargv(table.wrap(objectfiles), self:_targetkind(), targetfile, opt.linkflags or self:linkflags(opt), opt) end -- get the link command function linker:linkcmd(objectfiles, targetfile, opt) - opt = self:_add_implibdir_to_options(opt) + opt = self:_add_implib_to_options(opt) return os.args(table.join(self:linkargv(objectfiles, targetfile, opt))) end |
