summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/xmake.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2024-01-26 23:15:10 +0800
committerGitHub <[email protected]>2024-01-26 23:15:10 +0800
commit445e43b40846b29b9abb1293b32b27b7104f54fa (patch)
treed8385c41e4225216ceb165badb0b9d49409bcfd8 /xmake/modules/package/tools/xmake.lua
parent8aeb3f7b343981756cdb8b468238776be7285f20 (diff)
parentc4e9dcda21240b9683273a771d4c79446d706d91 (diff)
Merge pull request #4658 from xmake-io/xmakenv
remove PATH in xmake
Diffstat (limited to 'xmake/modules/package/tools/xmake.lua')
-rw-r--r--xmake/modules/package/tools/xmake.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua
index 27c0bd872..0a7dd231a 100644
--- a/xmake/modules/package/tools/xmake.lua
+++ b/xmake/modules/package/tools/xmake.lua
@@ -467,7 +467,7 @@ function install(package, configs, opt)
local repo_argv = {"repo"}
_set_builtin_argv(package, repo_argv)
table.join2(repo_argv, {"--add", repo:name(), repo:directory()})
- os.vrunv("xmake", repo_argv, {envs = envs})
+ os.vrunv(os.programfile(), repo_argv, {envs = envs})
end
-- pass configurations
@@ -488,7 +488,7 @@ function install(package, configs, opt)
end
-- do configure
- os.vrunv("xmake", argv, {envs = envs})
+ os.vrunv(os.programfile(), argv, {envs = envs})
-- do build
argv = {"build"}
@@ -500,7 +500,7 @@ function install(package, configs, opt)
if njob then
table.insert(argv, "--jobs=" .. njob)
end
- os.vrunv("xmake", argv, {envs = envs})
+ os.vrunv(os.programfile(), argv, {envs = envs})
-- do install
argv = {"install", "-y", "--nopkgs", "-o", package:installdir()}
@@ -508,5 +508,5 @@ function install(package, configs, opt)
if opt.target then
table.insert(argv, opt.target)
end
- os.vrunv("xmake", argv, {envs = envs})
+ os.vrunv(os.programfile(), argv, {envs = envs})
end