Skip to content

Commit

Permalink
Resolve compiler path before verification (fixes issue #4141) (#4142)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistersandman authored and michelleangela committed Aug 26, 2019
1 parent a17cb42 commit d51ae12
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Extension/src/LanguageServer/configurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ export class CppProperties {
configuration.intelliSenseMode === "${default}") {
return true;
}
let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(configuration.compilerPath);
let resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath, true);
let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(resolvedCompilerPath);
return (compilerPathAndArgs.compilerName === "cl.exe") === (configuration.intelliSenseMode === "msvc-x64" || configuration.intelliSenseMode === "msvc-x86");
}

Expand Down

0 comments on commit d51ae12

Please sign in to comment.