diff options
Diffstat (limited to 'editors/code/src/toolchain.ts')
-rw-r--r-- | editors/code/src/toolchain.ts | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts index b746da1d9..5725bcafe 100644 --- a/editors/code/src/toolchain.ts +++ b/editors/code/src/toolchain.ts | |||
@@ -4,7 +4,7 @@ import * as path from 'path'; | |||
4 | import * as fs from 'fs'; | 4 | import * as fs from 'fs'; |
5 | import * as readline from 'readline'; | 5 | import * as readline from 'readline'; |
6 | import { OutputChannel } from 'vscode'; | 6 | import { OutputChannel } from 'vscode'; |
7 | import { log, memoize } from './util'; | 7 | import { execute, log, memoize } from './util'; |
8 | 8 | ||
9 | interface CompilationArtifact { | 9 | interface CompilationArtifact { |
10 | fileName: string; | 10 | fileName: string; |
@@ -122,24 +122,11 @@ export class Cargo { | |||
122 | } | 122 | } |
123 | 123 | ||
124 | /** Mirrors `project_model::sysroot::discover_sysroot_dir()` implementation*/ | 124 | /** Mirrors `project_model::sysroot::discover_sysroot_dir()` implementation*/ |
125 | export function sysrootForDir(dir: string): Promise<string> { | 125 | export function getSysroot(dir: string): Promise<string> { |
126 | const rustc_path = getPathForExecutable("rustc"); | 126 | const rustcPath = getPathForExecutable("rustc"); |
127 | |||
128 | return new Promise((resolve, reject) => { | ||
129 | cp.exec(`${rustc_path} --print sysroot`, { cwd: dir }, (err, stdout, stderr) => { | ||
130 | if (err) { | ||
131 | reject(err); | ||
132 | return; | ||
133 | } | ||
134 | |||
135 | if (stderr) { | ||
136 | reject(new Error(stderr)); | ||
137 | return; | ||
138 | } | ||
139 | 127 | ||
140 | resolve(stdout.trimEnd()); | 128 | // do not memoize the result because the toolchain may change between runs |
141 | }); | 129 | return execute(`${rustcPath} --print sysroot`, { cwd: dir }); |
142 | }); | ||
143 | } | 130 | } |
144 | 131 | ||
145 | /** Mirrors `toolchain::cargo()` implementation */ | 132 | /** Mirrors `toolchain::cargo()` implementation */ |