Skip to content

Commit

Permalink
Merge branch 'main' into fix-windows
Browse files Browse the repository at this point in the history
  • Loading branch information
robertsLando authored Nov 4, 2024
2 parents 9d3dacd + 4acb187 commit 375f0a6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions prelude/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const fs = require('fs');
const { isRegExp } = require('util').types;
const Module = require('module');
const path = require('path');
const { promisify, _extend } = require('util');
const { promisify } = require('util');
const { Script } = require('vm');
const { homedir } = require('os');
const util = require('util');
Expand Down Expand Up @@ -2005,7 +2005,7 @@ function payloadFileSync(pointer) {
args.splice(pos, 0, {});
}
const opts = args[pos];
if (!opts.env) opts.env = _extend({}, process.env);
if (!opts.env) opts.env = { ...process.env };
// see https://github.com/vercel/pkg/issues/897#issuecomment-1049370335
if (opts.env.PKG_EXECPATH !== undefined) return;
opts.env.PKG_EXECPATH = EXECPATH;
Expand Down

0 comments on commit 375f0a6

Please sign in to comment.