maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use x64 node for darwin-arm64. Fixes #115009

Browse source
This commit is contained in:
Martin Aeschlimann 2021-01-27 16:49:10 +01:00
parent 96fa81bb74
commit e4f1833d79
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/gulpfile.reh.js
View file

@ -68,7 +68,8 @@ BUILD_TARGETS.forEach(({ platform, arch }) => {
}));
});
const defaultNodeTask = gulp.task(`node-${process.platform}-${process.arch}`);
const arch = process.platform === 'darwin' ? 'x64' : process.arch;
const defaultNodeTask = gulp.task(`node-${process.platform}-${arch}`);
if (defaultNodeTask) {
gulp.task(task.define('node', defaultNodeTask));

10
build/lib/node.ts
View file

@ -10,7 +10,11 @@ const root = path.dirname(path.dirname(__dirname));
const yarnrcPath = path.join(root, 'remote', '.yarnrc');
const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
const node = process.platform === 'win32' ? 'node.exe' : 'node';
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
console.log(nodePath);
const platform = process.platform;
const arch = platform === 'darwin' ? 'x64' : process.arch;
const node = platform === 'win32' ? 'node.exe' : 'node';
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
console.log(nodePath);