From 37c10d665f000c5387ca8a686a41cddb6dd85014 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Fri, 9 Feb 2024 11:27:26 +0100 Subject: fix libc++.modules.json finding --- xmake/rules/c++/modules/modules_support/clang/compiler_support.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 24915cd04..dc6930b23 100644 --- a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua +++ b/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua @@ -209,9 +209,9 @@ 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("libc++.modules.json", clang_lib_path) + local modules_json_path = path.join(clang_lib_path, "libc++.modules.json") -- maybe in subdir - if not modules_json_path then + if not os.isfile(modules_json_path) then modules_json_path = find_file("*/libc++.modules.json", clang_lib_path) end if modules_json_path then -- cgit v1.3.1