development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Alex Dima 2022-02-28 18:11:40 +01:00
parent 51702c7b5f
commit 6289768fc2
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/gulpfile.reh.js
View file

@ -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' },

6
build/npm/postinstall.js
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 };