diff options
| author | ruki <[email protected]> | 2021-04-13 22:42:22 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-04-13 22:42:22 +0800 |
| commit | 84b64c4ecffe6ed4a498efa8116271ecba78e52d (patch) | |
| tree | 4f03fff7f04d6fd648b9bfce26348463b4bc7423 /xmake/core/package/package.lua | |
| parent | 317745583da0e5c940f6e300c5f6163eb800efbf (diff) | |
improve envs
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 3c2f36e75..c4db97454 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -591,18 +591,8 @@ end -- enter the package environments function _instance:envs_enter() - - -- save the old environments - local oldenvs = self._OLDENVS - if not oldenvs then - oldenvs = {} - self._OLDENVS = oldenvs - end - - -- add the new environments local installdir = self:installdir() for name, values in pairs(self:envs()) do - oldenvs[name] = oldenvs[name] or os.getenv(name) if name == "PATH" or name == "LD_LIBRARY_PATH" or name == "DYLD_LIBRARY_PATH" then for _, value in ipairs(values) do if path.is_absolute(value) then @@ -617,24 +607,6 @@ function _instance:envs_enter() end end --- leave the package environments -function _instance:envs_leave() - local oldenvs = self._OLDENVS - if oldenvs then - -- remove new added values - for name, _ in pairs(self:envs()) do - if not oldenvs[name] then - os.setenv(name, nil) - end - end - -- restore old values - for name, values in pairs(oldenvs) do - os.setenv(name, values) - end - self._OLDENVS = nil - end -end - -- get the given environment variable function _instance:getenv(name) return self:envs()[name] |
