Commit9d4238b

authored

Fix bug with cwd in build tasks. (microsoft#6954)

1 parent9ba19af commit9d4238bCopy full SHA for 9d4238b

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {`
`190`	`190`	`// This property will be removed before writing the DebugConfiguration in launch.json.`
`191`	`191`	`newConfig.detail=task.detail ?task.detail :definition.command;`
`192`	`192`	`constisCl:boolean=compilerName==="cl.exe";`
`193`		`-newConfig.cwd=isWindows&&!isCl&&!process.env.PATH?.includes(compilerPath) ?path.dirname(compilerPath) :"${workspaceFolder}";`
	`193`	`+newConfig.cwd=isWindows&&!isCl&&!process.env.PATH?.includes(path.dirname(compilerPath)) ?path.dirname(compilerPath) :"${workspaceFolder}";`
`194`	`194`
`195`	`195`	`returnnewPromise<vscode.DebugConfiguration>(resolve=>{`
`196`	`196`	`if(platform==="darwin"){`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export class CppBuildTaskProvider implements TaskProvider {`
`169`	`169`	`if(compilerArgs&&compilerArgs.length>0){`
`170`	`170`	`args=args.concat(compilerArgs);`
`171`	`171`	`}`
`172`		`-constcwd:string=isWindows&&!isCl&&!process.env.PATH?.includes(compilerPath) ?path.dirname(compilerPath) :"${workspaceFolder}";`
	`172`	`+constcwd:string=isWindows&&!isCl&&!process.env.PATH?.includes(path.dirname(compilerPath)) ?path.dirname(compilerPath) :"${workspaceFolder}";`
`173`	`173`	`constoptions:cp.ExecOptions\|undefined={cwd:cwd};`
`174`	`174`	`definition={`
`175`	`175`	`type:CppBuildTaskProvider.CppBuildScriptType,`

Comments

(0)