summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/linker.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-12 13:19:19 +0800
committerruki <[email protected]>2015-06-12 13:19:19 +0800
commit5dbb7213dae2568a85bd4cbc7fcfeefc8a908fc9 (patch)
tree7f4ddddbab481985e5426dd07be207d4ffc60ddb /xmake/scripts/base/linker.lua
parent1b9fc52acd62fea9dfa017481b146cf59993b1df (diff)
add linkdirs and includedirs for platform
Diffstat (limited to 'xmake/scripts/base/linker.lua')
-rw-r--r--xmake/scripts/base/linker.lua16
1 files changed, 15 insertions, 1 deletions
diff --git a/xmake/scripts/base/linker.lua b/xmake/scripts/base/linker.lua
index a521a1cbf..caddaadc4 100644
--- a/xmake/scripts/base/linker.lua
+++ b/xmake/scripts/base/linker.lua
@@ -149,8 +149,22 @@ function linker._addflags_from_platform(module, flags, flagname)
-- check
assert(module and flags and flagname)
- -- done
+ -- add flags
table.join2(flags, linker._mapflags(module, platform.get(flagname)))
+
+ -- add the linkdirs flags
+ if module.flag_linkdir then
+ for _, linkdir in ipairs(utils.wrap(platform.get("linkdirs"))) do
+ table.join2(flags, module:flag_linkdir(linkdir))
+ end
+ end
+
+ -- add the links flags
+ if module.flag_link then
+ for _, link in ipairs(utils.wrap(platform.get("links"))) do
+ table.join2(flags, module:flag_link(link))
+ end
+ end
end
-- add flags from the target