diff options
| author | ruki <[email protected]> | 2022-12-01 06:18:30 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-01 06:18:30 +0800 |
| commit | b7cb532c705607ab040c1f94ef6a95047fad8dbd (patch) | |
| tree | bb2600160e762538d6213ecccea70455799ef4f4 /xmake/rules/c++/modules/modules_support | |
| parent | df25bc8dfac8cbf690f6dff8dd263421a7ca795a (diff) | |
| parent | d18ba1a5013f4e0cc7a408d8b2701484e54d1406 (diff) | |
Merge pull request #3121 from Arthapz/fix-clang-modules
Fix clang module support
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/clang.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index a3cf06e79..678a0ccd3 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -110,7 +110,7 @@ end -- # 58 "/usr/include/c++/11/vector" 3 -- # 59 "/usr/include/c++/11/vector" 3 -- -function _get_toolchain_includedirs_for_stlheaders(includedirs, clang) +function _get_toolchain_includedirs_for_stlheaders(target, includedirs, clang) local tmpfile = os.tmpfile() .. ".cc" io.writefile(tmpfile, "#include <vector>") local argv = {"-E", "-x", "c++", tmpfile} @@ -181,7 +181,7 @@ function toolchain_includedirs(target) includedirs = {} local clang, toolname = target:tool("cc") assert(toolname == "clang") - _get_toolchain_includedirs_for_stlheaders(includedirs, clang) + _get_toolchain_includedirs_for_stlheaders(target, includedirs, clang) local _, result = try {function () return os.iorunv(clang, {"-E", "-Wp,-v", "-xc", os.nuldev()}) end} if result then for _, line in ipairs(result:split("\n", {plain = true})) do |