diff options
| author | ruki <[email protected]> | 2021-11-13 13:52:57 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-11-13 13:52:57 +0800 |
| commit | 80326fdfb7fa838d3dc79aa24c9dcc01519b173b (patch) | |
| tree | 0c2461c8dc9ec446af28274983e11fe508cef200 /xmake/modules | |
| parent | 6b684d5cc448124c31a51fff71e4043667677a57 (diff) | |
add edition for rust
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/core/tools/rustc.lua | 5 | ||||
| -rw-r--r-- | xmake/modules/package/manager/cargo/find_package.lua | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua index 19588136a..ab41620cd 100644 --- a/xmake/modules/core/tools/rustc.lua +++ b/xmake/modules/core/tools/rustc.lua @@ -65,6 +65,11 @@ function nf_syslink(self, lib) return nf_link(self, lib) end +-- make the frameworkdir flag, crate module dependency directories +function nf_frameworkdir(self, frameworkdir) + return {"-L", "dependency=" .. frameworkdir} +end + -- make the framework flag, crate module function nf_framework(self, framework) local basename = path.basename(framework) diff --git a/xmake/modules/package/manager/cargo/find_package.lua b/xmake/modules/package/manager/cargo/find_package.lua index cc546704e..7fd151d5c 100644 --- a/xmake/modules/package/manager/cargo/find_package.lua +++ b/xmake/modules/package/manager/cargo/find_package.lua @@ -32,25 +32,25 @@ import("lib.detect.find_file") -- @param opt the options, e.g. {verbose = true, require_version = "1.12.x") -- function main(name, opt) - local linkdirs + local frameworkdirs local frameworks local librarydir = path.join(opt.installdir, "lib") local libfiles = os.files(path.join(librarydir, "*.rlib")) for _, libraryfile in ipairs(libfiles) do local filename = path.filename(libraryfile) if filename:startswith("lib" .. name .. "-") then - linkdirs = linkdirs or {} + frameworkdirs = frameworkdirs or {} frameworks = frameworks or {} - table.insert(linkdirs, librarydir) + table.insert(frameworkdirs, librarydir) table.insert(frameworks, libraryfile) break end end local result - if frameworks and linkdirs then + if frameworks and frameworkdirs then result = result or {} result.libfiles = libfiles - result.linkdirs = linkdirs + result.frameworkdirs = frameworkdirs result.frameworks = frameworks result.version = opt.require_version end |
