mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Force using x64
when running yarn
on the remote
folder on macOS
This commit is contained in:
parent
51702c7b5f
commit
6289768fc2
|
@ -39,7 +39,7 @@ const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
|
|||
const BUILD_TARGETS = [
|
||||
{ platform: 'win32', arch: 'ia32' },
|
||||
{ platform: 'win32', arch: 'x64' },
|
||||
{ platform: 'darwin', arch: null },
|
||||
{ platform: 'darwin', arch: null }, // TODO@server-darwin-arm64: See also postinstall.js which hard-codes remote to x64
|
||||
{ platform: 'linux', arch: 'ia32' },
|
||||
{ platform: 'linux', arch: 'x64' },
|
||||
{ platform: 'linux', arch: 'armhf' },
|
||||
|
|
|
@ -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 };
|
||||
|
|
Loading…
Reference in a new issue