diff options
| author | ruki <[email protected]> | 2024-02-06 21:43:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-06 21:43:53 +0800 |
| commit | 0c8646de19a28268d651f954b187120b3319a009 (patch) | |
| tree | 1f4878fde067354cf0544151dd955278c71f733e | |
| parent | 05b80a342d3a456504799a9abe228d0f81c18878 (diff) | |
| parent | c11559ee96ac6289713365de62e04ddbbb6be7e0 (diff) | |
Merge pull request #4714 from Arthapz/fix-stdmodule-clang
fix stdmodule find_file and update test
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp index b87808a6e..ab3119785 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp @@ -2,4 +2,4 @@ module my_module; import std; -auto my_sum(size_t a, size_t b) -> size_t { return a + b; } +auto my_sum(std::size_t a, std::size_t b) -> std::size_t { return a + b; } diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.mpp b/tests/projects/c++/modules/stdmodules/src/my_module.mpp index bbebb2766..a1cd98e57 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp @@ -2,4 +2,4 @@ export module my_module; import std; -export auto my_sum(size_t a, size_t b) -> size_t; +export auto my_sum(std::size_t a, std::size_t b) -> std::size_t; diff --git a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua b/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua index 53da9a36c..fed5cb29d 100644 --- a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua +++ b/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua @@ -209,7 +209,7 @@ function get_stdmodules(target) -- @see https://github.com/llvm/llvm-project/pull/76451 (has been revert, so we need to wait) local clang_path = path.directory(get_clang_path(target)) local clang_lib_path = path.join(clang_path, "..", "lib") - local modules_json_path = find_file("**.modules.json", clang_lib_path) + local modules_json_path = find_file("*libc++.modules.json", clang_lib_path) if modules_json_path then local modules_json = json.decode(io.readfile(modules_json_path)) local std_module_directory = path.directory(modules_json.modules[1]["source-path"]) |