summaryrefslogtreecommitdiff
path: root/xmake/core/package/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-09-19 23:17:53 +0800
committerruki <[email protected]>2018-09-19 13:47:18 +0800
commit3effabb03faacb09d5b566f8e72a5171bfaaa97e (patch)
tree2170cc518e15d2e0eaec190bb125b6ab2b22d52c /xmake/core/package/package.lua
parentdae812d748abf4b10812028acb81d6187fd5e2af (diff)
add search directories for prefix
Diffstat (limited to 'xmake/core/package/package.lua')
-rw-r--r--xmake/core/package/package.lua9
1 files changed, 7 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 85b259843..918db45b3 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -193,9 +193,9 @@ end
-- get the prefix directory
function _instance:prefixdir(...)
-
+
-- make the given prefix directory
- local dir = path.join(self:from("global") and global.directory() or config.directory(), "prefix", self:debug() and "debug" or "release", config.get("plat") or os.host(), config.get("arch") or os.arch(), ...)
+ local dir = path.join(package.prefixdir(self:from("global")), is_debug and "debug" or "release", config.get("plat") or os.host(), config.get("arch") or os.arch(), ...)
-- ensure the prefix directory
if not os.isdir(dir) then
@@ -555,6 +555,11 @@ function package.cachedir()
return path.join(global.directory(), "cache", "packages")
end
+-- get the prefix directory
+function package.prefixdir(is_global)
+ return path.join(is_global and global.directory() or config.directory(), "prefix")
+end
+
-- load the package from the system directories
function package.load_from_system(packagename)