Merge pull request #4986 from xmake-io/runenvs

Improve runenvs

1 files changed, 0 insertions, 33 deletions

diff --git a/xmake/modules/devel/debugger/run.lua b/xmake/modules/devel/debugger/run.lua
index 6befa017e..29c3f8c45 100644
--- a/xmake/modules/devel/debugger/run.lua
+++ b/xmake/modules/devel/debugger/run.lua
@@ -50,9 +50,6 @@ function _run_gdb(program, argv, opt)
     table.insert(argv, 1, program)
     table.insert(argv, 1, "--args")
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(gdb, argv, table.join(opt, {exclusive = true}))
     return true
@@ -73,9 +70,6 @@ function _run_cudagdb(program, argv, opt)
     table.insert(argv, 1, program)
     table.insert(argv, 1, "--args")
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(gdb, argv, table.join(opt, {exclusive = true}))
     return true
@@ -103,9 +97,6 @@ function _run_lldb(program, argv, opt)
         table.insert(argv, 1, names[i])
     end
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(names[1], argv, table.join(opt, {exclusive = true}))
     return true
@@ -124,9 +115,6 @@ function _run_windbg(program, argv, opt)
     argv = argv or {}
     table.insert(argv, 1, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     opt.detach = true
     os.execv(windbg, argv, opt)
@@ -146,9 +134,6 @@ function _run_cudamemcheck(program, argv, opt)
     argv = argv or {}
     table.insert(argv, 1, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(cudamemcheck, argv, opt)
     return true
@@ -167,9 +152,6 @@ function _run_x64dbg(program, argv, opt)
     argv = argv or {}
     table.insert(argv, 1, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     opt.detach = true
     os.execv(x64dbg, argv, opt)
@@ -189,9 +171,6 @@ function _run_ollydbg(program, argv, opt)
     argv = argv or {}
     table.insert(argv, 1, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     opt.detach = true
     os.execv(ollydbg, argv, opt)
@@ -211,9 +190,6 @@ function _run_vsjitdebugger(program, argv, opt)
     argv = argv or {}
     table.insert(argv, 1, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     opt.detach = true
     os.execv(vsjitdebugger, argv, opt)
@@ -234,9 +210,6 @@ function _run_devenv(program, argv, opt)
     table.insert(argv, 1, "/DebugExe")
     table.insert(argv, 2, program)
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     opt.detach = true
     os.execv(devenv, argv, opt)
@@ -332,9 +305,6 @@ function _run_gede(program, argv, opt)
     table.insert(argv, 1, "--args")
     table.insert(argv, 1, "--no-show-config")
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(gede.program, argv, table.join(opt, {exclusive = true}))
     return true
@@ -355,9 +325,6 @@ function _run_seergdb(program, argv, opt)
     table.insert(argv, 1, program)
     table.insert(argv, 1, "--start")
 
-    -- handle envs
-    opt.envs = runenvs.join(opt.addenvs, opt.setenvs)
-
     -- run it
     os.execv(seergdb.program, argv, table.join(opt, {exclusive = true}))
     return true