From c9d828d7e955ed9aaf19e8a88980615a2facef11 Mon Sep 17 00:00:00 2001 From: MoreThanTom Date: Fri, 22 Mar 2019 20:55:52 +0000 Subject: [PATCH] Fix: Assigning arch before generating the binary path --- scripts/build.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index 8fac5ebb5..d7aa7f11a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -88,27 +88,27 @@ var argv = Object.assign(Constants.DefaultOptions, yargs alias: 'd' }).argv); -var BinaryPath = sass.getBinaryPath(argv); -if (!argv.force && fs.existsSync(BinaryPath)) { - console.log('Binary found at', BinaryPath); - process.exit(0); +var ModuleDetails = Constants.ModuleVersions[argv.modulesVersion]; +if (!ModuleDetails) { + console.error('Unknown Node Modules Version: ' + argv.modulesVersion); + process.exit(1); } - var gypOptions = { arch: argv.arch, jobs: argv.jobs, target: argv.target, debug: argv.debug }; -var ModuleDetails = Constants.ModuleVersions[argv.modulesVersion]; -if (!ModuleDetails) { - console.error('Unknown Node Modules Version: ' + argv.modulesVersion); - process.exit(1); -} if (ModuleDetails[0] === Constants.Runtimes.ELECTRON) { gypOptions['dist-url'] = 'https://atom.io/download/electron'; argv.arch = gypOptions.arch = process.platform === 'win32' ? 'ia32' : process.arch; } +var BinaryPath = sass.getBinaryPath(argv); +if (!argv.force && fs.existsSync(BinaryPath)) { + console.log('Binary found at', BinaryPath); + process.exit(0); +} + build(gypOptions, function (errorCode) { if (errorCode) {