summaryrefslogtreecommitdiff
path: root/xmake/modules/core/tools/gcc.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-05-08 22:46:38 +0800
committerruki <[email protected]>2018-05-08 10:39:52 +0800
commitc61545b0275b64c8b0294ce69e635e30475a2239 (patch)
tree0eba3c71f7065c5546f059e755f1ac869d4ac4fd /xmake/modules/core/tools/gcc.lua
parent5a1eebb5b49e7476ceb773d9b846c0c61c9f99c8 (diff)
improve build dependence
Diffstat (limited to 'xmake/modules/core/tools/gcc.lua')
-rw-r--r--xmake/modules/core/tools/gcc.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index a79c122c4..e0fa9a188 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -433,7 +433,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
end
-- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- ensure the object directory
os.mkdir(path.directory(objectfile))
@@ -485,8 +485,9 @@ function _compile1(self, sourcefile, objectfile, depinfo, flags)
}
-- generate the dependent includes
- if depinfo and self:kind() ~= "as" then
- depinfo.includes = _include_deps(self, sourcefile, flags)
+ if dependinfo and self:kind() ~= "as" then
+ dependinfo.files = dependinfo.files or {}
+ table.join2(dependinfo.files, _include_deps(self, sourcefile, flags))
end
end
@@ -501,12 +502,12 @@ function compargv(self, sourcefiles, objectfile, flags)
end
-- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
-- only support single source file now
assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
-- for only single source file
- _compile1(self, sourcefiles, objectfile, depinfo, flags)
+ _compile1(self, sourcefiles, objectfile, dependinfo, flags)
end