summaryrefslogtreecommitdiff
path: root/xmake/plugins/project/makefile/makefile.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-02-15 20:30:21 +0800
committerruki <[email protected]>2017-02-15 20:30:21 +0800
commitdfce526796ade25d4da69c2542929e9c4662402a (patch)
tree728b41a29712a38f02ebc075620ac2a905e72666 /xmake/plugins/project/makefile/makefile.lua
parent80d3a926e762d7b05654fdc778c70dad9881356d (diff)
add linker to target
Diffstat (limited to 'xmake/plugins/project/makefile/makefile.lua')
-rwxr-xr-xxmake/plugins/project/makefile/makefile.lua6
1 files changed, 1 insertions, 5 deletions
diff --git a/xmake/plugins/project/makefile/makefile.lua b/xmake/plugins/project/makefile/makefile.lua
index 1c7ea5733..fd76227de 100755
--- a/xmake/plugins/project/makefile/makefile.lua
+++ b/xmake/plugins/project/makefile/makefile.lua
@@ -24,7 +24,6 @@
-- imports
import("core.tool.tool")
-import("core.tool.linker")
import("core.tool.compiler")
import("core.project.config")
import("core.project.project")
@@ -160,13 +159,10 @@ function _make_target(makefile, target)
-- make dependence end
makefile:print("")
- -- make the command
- local command = linker.linkcmd(target:objectfiles(), targetfile, target)
-
-- make body
makefile:print("\t@echo linking.$(mode) %s", path.filename(targetfile))
_mkdir(makefile, path.directory(targetfile))
- makefile:print("\t@%s > %s 2>&1", command, _logfile())
+ makefile:print("\t@%s > %s 2>&1", target:linkcmd(), _logfile())
-- make headers
local srcheaders, dstheaders = target:headerfiles()