From 7c40738d8d1bc95fbb6c79ca267206502e9afdd7 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 25 Dec 2019 23:16:30 +0800 Subject: enable deps for gcc/asm --- xmake/modules/core/tools/gcc.lua | 2 +- xmake/modules/private/tools/gcc/parse_deps.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua index 9127cac8d..8fb5a4d81 100644 --- a/xmake/modules/core/tools/gcc.lua +++ b/xmake/modules/core/tools/gcc.lua @@ -445,7 +445,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- generate the dependent includes if depfile and os.isfile(depfile) then - if dependinfo and self:kind() ~= "as" then + if dependinfo then local files = dependinfo.files or {} table.join2(files, parse_deps(depfile)) dependinfo.files = table.unique(files) diff --git a/xmake/modules/private/tools/gcc/parse_deps.lua b/xmake/modules/private/tools/gcc/parse_deps.lua index f24084439..a7e10a45e 100644 --- a/xmake/modules/private/tools/gcc/parse_deps.lua +++ b/xmake/modules/private/tools/gcc/parse_deps.lua @@ -56,8 +56,8 @@ end -- function main(depsfile) + -- get deps data local depsdata = io.readfile(depsfile, { continuation = "\\"}) - -- check if not depsdata or #depsdata == 0 then return {} end -- cgit v1.3.1