Skip to content

Commit cf6b06b

Browse files
committed
Fix an issue preventing use of a full command line in compilerPath
1 parent 2431425 commit cf6b06b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Extension/src/LanguageServer/configurations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ export class CppProperties {
594594
configuration.intelliSenseMode === "${default}") {
595595
return "";
596596
}
597-
const resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath);
597+
const resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath, false, false);
598598
const settings: CppSettings = new CppSettings(this.rootUri);
599599
const compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(!!settings.legacyCompilerArgsBehavior, resolvedCompilerPath);
600600

@@ -1878,7 +1878,7 @@ export class CppProperties {
18781878
const paths: string[] = [];
18791879
let compilerPath: string | undefined;
18801880
for (const pathArray of [currentConfiguration.browse ? currentConfiguration.browse.path : undefined,
1881-
currentConfiguration.includePath, currentConfiguration.macFrameworkPath]) {
1881+
currentConfiguration.includePath, currentConfiguration.macFrameworkPath]) {
18821882
if (pathArray) {
18831883
for (const curPath of pathArray) {
18841884
paths.push(`${curPath}`);

0 commit comments

Comments
 (0)