summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-01-04 23:37:24 +0800
committerruki <[email protected]>2025-01-04 23:37:24 +0800
commit5bf1f7fc78bc95c8360eb2b004481b3e85769897 (patch)
tree28e4d69eea88f96c586de84a12b1f61ba74344e2
parent59d4ebf3e100a4de90708e0cddf50b61bbd89802 (diff)
fix includes
-rw-r--r--xmake/core/base/interpreter.lua11
1 files changed, 10 insertions, 1 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index c8cdd9773..f23e064cf 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -1712,7 +1712,16 @@ function interpreter:api_builtin_includes(...)
end
-- find the given files from the project directory
if not found then
- local files = os.match(subpath, not subpath:endswith(".lua"))
+ local files
+ if subpath:endswith(".lua") then
+ files = os.files(subpath)
+ else
+ -- @see https://github.com/xmake-io/xmake/issues/6026
+ local file = path.join(subpath, path.filename(curfile))
+ if os.isfile(file) then
+ files = {file}
+ end
+ end
if files and #files > 0 then
table.join2(subpaths_matched, files)
found = true