summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
index 355c855dd9a..50e0522c9cf 100644
--- a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
+++ b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
@@ -23,8 +23,10 @@ export function activate(context: vscode.ExtensionContext) {
args: getConfig<string[]>('arguments')
};
const traceFile = getConfig<string>('trace');
- if (traceFile != null)
- clangd.options = {env: {CLANGD_TRACE: traceFile}};
+ if (traceFile != '') {
+ const trace = {CLANGD_TRACE : traceFile};
+ clangd.options = {env : {...process.env, ...trace}};
+ }
const serverOptions: vscodelc.ServerOptions = clangd;
const filePattern: string = '**/*.{' +
OpenPOWER on IntegriCloud