summaryrefslogtreecommitdiff
path: root/xmake/actions/require/impl/environment.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-01-24 22:33:54 +0800
committerruki <[email protected]>2021-01-24 22:33:54 +0800
commit4e39a9f9da50f54eef30e289078d8794fd5d74ad (patch)
treecc42ac436f7a374116e0ff13bb3f6cb21b96ce9a /xmake/actions/require/impl/environment.lua
parent80aa72c198b210343c37ecb7db584a700274a783 (diff)
remove environment
Diffstat (limited to 'xmake/actions/require/impl/environment.lua')
-rw-r--r--xmake/actions/require/impl/environment.lua15
1 files changed, 4 insertions, 11 deletions
diff --git a/xmake/actions/require/impl/environment.lua b/xmake/actions/require/impl/environment.lua
index 1d163df63..89034fabf 100644
--- a/xmake/actions/require/impl/environment.lua
+++ b/xmake/actions/require/impl/environment.lua
@@ -20,7 +20,6 @@
-- imports
import("core.project.config")
-import("core.platform.environment")
import("core.package.package", {alias = "core_package"})
import("lib.detect.find_tool")
import("private.action.require.packagenv")
@@ -34,16 +33,13 @@ import("package")
--
function enter()
- -- set search paths of toolchains
- environment.enter("toolchains")
-
-- unzip or 7zip is necessary
if not find_tool("unzip") and not find_tool("7z") then
raise("unzip or 7zip not found! we need install it first")
end
- -- enter the environments of git and 7z
- packagenv.enter("git", "7z")
+ -- enter the environments of git
+ packagenv.enter("git")
-- git not found? install it first
local packages = {}
@@ -72,9 +68,6 @@ function leave()
end
_g._PACKAGES = nil
- -- leave the environments of git and 7z
- packagenv.leave("7z", "git")
-
- -- restore search paths of toolchains
- environment.leave("toolchains")
+ -- leave the environments of git
+ packagenv.leave("git")
end