diff options
| author | ruki <[email protected]> | 2018-11-08 23:04:58 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-11-08 12:29:51 +0800 |
| commit | d41f7ae50ae262ed3017c3713db50b79985e28e8 (patch) | |
| tree | 863972e659aabdc8db58d9f0831c78e70fd3da32 | |
| parent | da5ba0608b0db673077d30951b7227ed42a69dca (diff) | |
fix rust links bug
| -rw-r--r-- | xmake/languages/rust/api.lua | 6 | ||||
| -rw-r--r-- | xmake/languages/rust/xmake.lua | 18 | ||||
| -rw-r--r-- | xmake/modules/core/tools/rustc.lua | 5 |
3 files changed, 1 insertions, 28 deletions
diff --git a/xmake/languages/rust/api.lua b/xmake/languages/rust/api.lua index 2aefdc17b..726aeb3ab 100644 --- a/xmake/languages/rust/api.lua +++ b/xmake/languages/rust/api.lua @@ -29,15 +29,11 @@ function apis() _g.values = { -- target.add_xxx - "target.add_links" - , "target.add_syslinks" - , "target.add_rcflags" + "target.add_rcflags" , "target.add_ldflags" , "target.add_arflags" , "target.add_shflags" -- option.add_xxx - , "option.add_links" - , "option.add_syslinks" , "option.add_rcflags" , "option.add_ldflags" , "option.add_arflags" diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua index 579f995a6..3d7c9a4ad 100644 --- a/xmake/languages/rust/xmake.lua +++ b/xmake/languages/rust/xmake.lua @@ -70,14 +70,6 @@ language("rust") , "option.rpathdirs" , "platform.linkdirs" , "platform.rpathdirs" - , "config.links" - , "target.links" - , "option.links" - , "platform.links" - , "config.syslinks" - , "target.syslinks" - , "option.syslinks" - , "platform.syslinks" } , shared = { @@ -87,14 +79,6 @@ language("rust") , "target.symbols" , "option.linkdirs" , "platform.linkdirs" - , "config.links" - , "target.links" - , "option.links" - , "platform.links" - , "config.syslinks" - , "target.syslinks" - , "option.syslinks" - , "platform.syslinks" } , static = { @@ -116,8 +100,6 @@ language("rust") , {nil, "rc-sh", "kv", nil, "The Rust Shared Library Linker" } , {category = "Cross Complation Configuration/Builtin Flags Configuration" } - , {nil, "links", "kv", nil, "The Link Libraries" } - , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } } } diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua index 537175c93..8df967401 100644 --- a/xmake/modules/core/tools/rustc.lua +++ b/xmake/modules/core/tools/rustc.lua @@ -93,11 +93,6 @@ function nf_linkdir(self, dir) return "-L" .. os.args(dir) end --- make the link flag -function nf_link(self, lib) - return "-l" .. lib -end - -- make the build arguments list function buildargv(self, sourcefiles, targetkind, targetfile, flags) return self:program(), table.join(flags, "-o", targetfile, sourcefiles) |