summaryrefslogtreecommitdiff
path: root/xmake/core/platform/tool.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2016-03-04 10:31:12 +0800
committerruki <[email protected]>2016-03-04 10:31:12 +0800
commitae466964bd7404958782890a267e98bd104a43bd (patch)
treee9d779b1c8847072674552a90ffb3bf44fdcae7b /xmake/core/platform/tool.lua
parentf4b82ec9289932937c21e00b0ff35bb4f3544e3b (diff)
restore platform and project menu
Diffstat (limited to 'xmake/core/platform/tool.lua')
-rw-r--r--xmake/core/platform/tool.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/core/platform/tool.lua b/xmake/core/platform/tool.lua
index 79c0d216d..36047f410 100644
--- a/xmake/core/platform/tool.lua
+++ b/xmake/core/platform/tool.lua
@@ -28,7 +28,7 @@ local os = require("base/os")
local path = require("base/path")
local utils = require("base/utils")
local string = require("base/string")
-local platform = require("base/platform")
+local platform = require("platform/platform")
-- match the tool name
function tool._match(name, toolname)
@@ -124,10 +124,10 @@ function tool.find(name, root)
if root then return tool._find_from(root, name) end
-- attempt to find it from the current platform directory first
- if not filepath then filepath = tool._find_from(platform.directory() .. "/tool", name) end
+ if not filepath then filepath = tool._find_from(path.join(platform.directory(), "tools"), name) end
-- attempt to find it from the script directory
- if not filepath then filepath = tool._find_from(xmake._CORE_DIR .. "/tool", name) end
+ if not filepath then filepath = tool._find_from(path.join(xmake._CORE_DIR, "platform/tools"), name) end
-- ok?
return filepath