language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use explicit rustc commit-hash

Browse source 
Required for lldb on mac
This commit is contained in:
vsrs 2021-04-22 18:30:44 +03:00
parent 1ebfe11730
commit 1b4197cb35
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editors/code/src/debug.ts
View file

@ -3,7 +3,7 @@ import * as vscode from 'vscode';
import * as path from 'path';
import * as ra from './lsp_ext';
import { Cargo, getSysroot } from './toolchain';
import { Cargo, getRustcId, getSysroot } from './toolchain';
import { Ctx } from "./ctx";
import { prepareEnv } from "./run";
@ -107,9 +107,11 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v
let sourceFileMap = debugOptions.sourceFileMap;
if (sourceFileMap === "auto") {
// let's try to use the default toolchain
const commitHash = await getRustcId(wsFolder);
const sysroot = await getSysroot(wsFolder);
const rustlib = path.normalize(sysroot + "/lib/rustlib/src/rust");
sourceFileMap = { "/rustc/*": rustlib };
sourceFileMap = {};
sourceFileMap[`/rustc/${commitHash}/`] = rustlib;
}
const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, sourceFileMap);