Skip to content

Commit cb94da7

Browse files
authored
Merge pull request microsoft#704 from microsoft/tyriar/npm_arch
Copy right dll/exe based on npm_config_arch
2 parents 8c0a6d7 + 4f2f641 commit cb94da7

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

scripts/post-install.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,15 @@ console.log(`\x1b[32m> Moving conpty.dll...\x1b[0m`);
5050
if (os.platform() !== 'win32') {
5151
console.log(' SKIPPED (not Windows)');
5252
} else {
53-
const windowsArch = os.arch();
53+
let windowsArch;
54+
if (process.env.npm_config_arch) {
55+
windowsArch = process.env.npm_config_arch;
56+
console.log(` Using $npm_config_arch: ${windowsArch}`);
57+
} else {
58+
windowsArch = os.arch();
59+
console.log(` Using os.arch(): ${windowsArch}`);
60+
}
61+
5462
if (!CONPTY_SUPPORTED_ARCH.includes(windowsArch)) {
5563
console.log(` SKIPPED (unsupported architecture ${windowsArch})`);
5664
} else {

0 commit comments

Comments
 (0)