pinokiod 3.3.17 → 3.3.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/shell.js +3 -11
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -668,16 +668,8 @@ class Shell {
|
|
|
668
668
|
// Map architectures to vcvarsall.bat argument
|
|
669
669
|
let arg
|
|
670
670
|
if (architecture === 'x64' || armArchitecture === 'arm64') {
|
|
671
|
-
arg = '
|
|
672
|
-
|
|
673
|
-
arg = 'x86'; // 32-bit architecture
|
|
674
|
-
} else if (armArchitecture === 'amd64_arm') {
|
|
675
|
-
arg = 'amd64_arm'; // ARM-specific 64-bit
|
|
676
|
-
} else if (armArchitecture === 'x86_arm') {
|
|
677
|
-
arg = 'x86_arm'; // ARM-based 32-bit
|
|
678
|
-
}
|
|
679
|
-
if (architecture === 'x64' || armArchitecture === 'arm64') {
|
|
680
|
-
arg = 'amd64'; // Native 64-bit architecture
|
|
671
|
+
//arg = 'amd64'; // Native 64-bit architecture
|
|
672
|
+
arg = 'x64';
|
|
681
673
|
} else if (architecture === 'ia32' || armArchitecture === 'arm') {
|
|
682
674
|
arg = 'x86'; // Native 32-bit architecture
|
|
683
675
|
} else if (armArchitecture === 'x86_arm64') {
|
|
@@ -694,7 +686,7 @@ class Shell {
|
|
|
694
686
|
|
|
695
687
|
if (arg) {
|
|
696
688
|
console.log({ arg, vcvars_path })
|
|
697
|
-
conda_activation.push(
|
|
689
|
+
conda_activation.push(`"${vcvars_path}" ${arg} > nul 2>&1`)
|
|
698
690
|
}
|
|
699
691
|
console.log('vc vars setup successful')
|
|
700
692
|
} else {
|