summaryrefslogtreecommitdiff
path: root/xmake/core/platform/environment.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-12-05 00:43:24 +0800
committerruki <[email protected]>2018-12-04 23:29:11 +0800
commit6aee7d32d56860554ab336ff575e86ba98b09ef9 (patch)
treed44329f21b0542be677a252a6172d2b962a057b5 /xmake/core/platform/environment.lua
parent51ab6ac31838463dab940c0d333bce4a2a54bbd6 (diff)
rename package build mode directory
Diffstat (limited to 'xmake/core/platform/environment.lua')
-rw-r--r--xmake/core/platform/environment.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/core/platform/environment.lua b/xmake/core/platform/environment.lua
index 654d4bc1a..dc8c65ef9 100644
--- a/xmake/core/platform/environment.lua
+++ b/xmake/core/platform/environment.lua
@@ -40,15 +40,15 @@ function environment._enter_toolchains()
environment._PATH = os.getenv("PATH")
-- add global search binary pathes
- local globaldir = package.prefixdir(true, false, os.host(), os.arch())
- for _, dir in ipairs(table.wrap(package.getenv(true, false, os.host(), os.arch(), "PATH"))) do
+ local globaldir = package.prefixdir(true, "release", os.host(), os.arch())
+ for _, dir in ipairs(table.wrap(package.getenv(true, "release", os.host(), os.arch(), "PATH"))) do
os.addenv("PATH", path.join(globaldir, dir))
end
os.addenv("PATH", path.join(globaldir, "bin"))
-- add local search binary pathes
- local localdir = package.prefixdir(false, false, os.host(), os.arch())
- for _, dir in ipairs(table.wrap(package.getenv(false, false, os.host(), os.arch(), "PATH"))) do
+ local localdir = package.prefixdir(false, "release", os.host(), os.arch())
+ for _, dir in ipairs(table.wrap(package.getenv(false, "release", os.host(), os.arch(), "PATH"))) do
os.addenv("PATH", path.join(localdir, dir))
end
os.addenv("PATH", path.join(localdir, "bin"))
@@ -80,7 +80,7 @@ function environment._enter_run()
environment._LD_LIBRARY_PATH = os.getenv("LD_LIBRARY_PATH")
-- add global search library pathes of pathes
- local globaldir = package.prefixdir(true, false, os.host(), os.arch())
+ local globaldir = package.prefixdir(true, "release", os.host(), os.arch())
if os.host() == "windows" then
os.addenv("PATH", path.join(globaldir, "lib"))
else
@@ -88,7 +88,7 @@ function environment._enter_run()
end
-- add local search library pathes of pathes
- local localdir = package.prefixdir(false, false, os.host(), os.arch())
+ local localdir = package.prefixdir(false, "release", os.host(), os.arch())
if os.host() == "windows" then
os.addenv("PATH", path.join(localdir, "lib"))
else