diff options
| author | as564335sa <[email protected]> | 2022-08-20 22:17:44 +0800 |
|---|---|---|
| committer | as564335sa <[email protected]> | 2022-08-20 22:17:44 +0800 |
| commit | 1a11eda96a41926817db3db835446531b20476b2 (patch) | |
| tree | 9cff05c4d298046dc5ddc4a2e17de6a76b84a981 | |
| parent | 50e0bd4261d85413348477ffc2bc1265d7e59354 (diff) | |
adjust files
| -rw-r--r-- | xmake/modules/core/project/depend.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/tools/armcc/parse_deps.lua (renamed from xmake/modules/private/tools/mdk/parse_deps_armcc.lua) | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xmake/modules/core/project/depend.lua b/xmake/modules/core/project/depend.lua index 7a04f951a..632ecd70f 100644 --- a/xmake/modules/core/project/depend.lua +++ b/xmake/modules/core/project/depend.lua @@ -25,7 +25,7 @@ import("private.tools.cl.parse_deps", {alias = "parse_deps_cl"}) import("private.tools.cl.parse_deps_json", {alias = "parse_deps_cl_json"}) import("private.tools.rc.parse_deps", {alias = "parse_deps_rc"}) import("private.tools.gcc.parse_deps", {alias = "parse_deps_gcc"}) -import("private.tools.mdk.parse_deps_armcc", {alias = "parse_deps_armcc"}) +import("private.tools.armcc.parse_deps", {alias = "parse_deps_armcc"}) -- load depfiles function _load_depfiles(parser, dependinfo, depfiles) diff --git a/xmake/modules/private/tools/mdk/parse_deps_armcc.lua b/xmake/modules/private/tools/armcc/parse_deps.lua index 457e1168b..980c56099 100644 --- a/xmake/modules/private/tools/mdk/parse_deps_armcc.lua +++ b/xmake/modules/private/tools/armcc/parse_deps.lua @@ -64,9 +64,8 @@ function main(depsdata) includefile = includefile:replace("\\:", ":", plain) end includefile = includefile:replace(space_placeholder, ' ', plain) - includefile = includefile:split(".o:", {plain = true})[2] - includefile = includefile:replace(' ','',plain) + includefile = includefile:replace(' ', '',plain) if #includefile > 0 then includefile = _normailize_dep(includefile, projectdir) if includefile then |