Pchen0/electron

fix: allow npm_config_arch override on mac (#32381)

If the npm_config_arch environment variable is set on Mac, then use the
specified architecture rather than overriding it to x64.

Co-authored-by: Tommy MacWilliam <[email protected]>

trop[bot] 3 years ago

parent

e640ab47fd

commit

59aba70e8f

1 changed files with 2 additions and 1 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 1
						
npm/install.js
							 
								View File
							
				@@ -22,7 +22,8 @@ if (isInstalled()) {
			
				 const platform = process.env.npm_config_platform || process.platform;
			
				 let arch = process.env.npm_config_arch || process.arch;
			
				-if (platform === 'darwin' && process.platform === 'darwin' && arch === 'x64') {
			
				+if (platform === 'darwin' && process.platform === 'darwin' && arch === 'x64' &&
			
				+    process.env.npm_config_arch === undefined) {
			
				   // When downloading for macOS ON macOS and we think we need x64 we should
			
				   // check if we're running under rosetta and download the arm64 version if appropriate
			
				   try {

fix: allow npm_config_arch override on mac (#32381)

+ 2 - 1 npm/install.js View File

+ 2 - 1
npm/install.js
View File