diff options
| author | OpportunityLiu <[email protected]> | 2019-07-17 13:03:53 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-17 13:03:53 +0800 |
| commit | e7bcde1188f02ac07e64f6b9a798e0b1ca1e049c (patch) | |
| tree | 729456608e65cc8d37f9c026682a661eae272e43 | |
| parent | cc8285058df86891bac366fdeac8086efa23d48b (diff) | |
set debugger path
| -rw-r--r-- | xmake/modules/devel/debugger/run.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/cuda/env/xmake.lua | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/xmake/modules/devel/debugger/run.lua b/xmake/modules/devel/debugger/run.lua index 59c99d7cb..af87c351a 100644 --- a/xmake/modules/devel/debugger/run.lua +++ b/xmake/modules/devel/debugger/run.lua @@ -235,10 +235,10 @@ function main(program, argv) local debugger = config.get("debugger") if debugger then debugger = debugger:lower() - + local debuggername = path.basename(debugger) -- try exactmatch first for _, _debugger in ipairs(debuggers) do - if debugger:startswith(_debugger[1]) then + if debuggername:startswith(_debugger[1]) then if _debugger[2](program, argv) then return end diff --git a/xmake/rules/cuda/env/xmake.lua b/xmake/rules/cuda/env/xmake.lua index 58aa13c0f..f69a1bea5 100644 --- a/xmake/rules/cuda/env/xmake.lua +++ b/xmake/rules/cuda/env/xmake.lua @@ -83,8 +83,11 @@ rule("cuda.env") import("lib.detect.find_tool") local debugger = config.get("debugger") - if not debugger and find_tool("cudagdb") then - config.set("debugger", "cudagdb") + if not debugger then + local cudagdb = find_tool("cudagdb") + if cudagdb then + config.set("debugger", cudagdb.program) + end end end) |