Force using x64 when running yarn on the remote folder on macOS

This commit is contained in:
Alex Dima
2022-02-28 18:11:40 +01:00
parent 51702c7b5f
commit 6289768fc2
2 changed files with 7 additions and 1 deletions

View File

@@ -64,6 +64,12 @@ for (let dir of dirs) {
if (process.env['CXXFLAGS']) { delete env['CXXFLAGS']; }
if (process.env['LDFLAGS']) { delete env['LDFLAGS']; }
if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
// TODO@server-darwin-arm64: Remove this check when support for arm64 for the server is added on darwin
if (/^remote/.test(dir) && process.platform === 'darwin' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
// darwin arm: force `x64` on remote folder
env['npm_config_arch'] = 'x64';
}
opts = { env };
} else if (/^extensions\//.test(dir)) {
opts = { ignoreEngines: true };