summaryrefslogtreecommitdiff
path: root/xmake/core/project/task.lua
diff options
context:
space:
mode:
authorTitanSnow <[email protected]>2017-05-25 08:07:12 +0800
committerTitanSnow <[email protected]>2017-05-25 08:12:46 +0800
commitb91fc2f5a31c9a7aefbc5585a60b14d6cfa614fa (patch)
treee4b206979a8e86f35e4c05b213acde2db949cf4e /xmake/core/project/task.lua
parent4fafe79dd79efe67c3ed92362152a8aa883788c7 (diff)
parentea123cda41560f549861eca8222a4153cb72bbd6 (diff)
Merge branch 'dev' into installtest
Diffstat (limited to 'xmake/core/project/task.lua')
-rw-r--r--xmake/core/project/task.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/xmake/core/project/task.lua b/xmake/core/project/task.lua
index 732a33b34..a162d84e4 100644
--- a/xmake/core/project/task.lua
+++ b/xmake/core/project/task.lua
@@ -203,8 +203,7 @@ function task._interpreter()
, configdir = config.directory()
, projectdir = xmake._PROJECT_DIR
, packagedir = package.directory()
- , programdir = xmake._PROGRAM_DIR
- , xmake = xmake._EXECUTABLE_PATH or path.join(xmake._PROGRAM_DIR, "xmake")
+ , programdir = os.programdir()
}
-- map it