From 75a1ff1037631eac6fa9e5545bda4e0d78073240 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 17 Oct 2016 15:09:35 +0200 Subject: [PATCH] tech(build): dont override arch for windows --- Gruntfile.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1f96048746b..9496ccd163c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,11 +12,15 @@ module.exports = function (grunt) { platform: process.platform.replace('win32', 'windows'), }; - if (process.platform.match(/^win/)) { - config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86'; - } + if (grunt.option('arch')) { + config.arch = grunt.option('arch') + } else { + config.arch = os.arch() - config.arch = grunt.option('arch') || os.arch(); + if (process.platform.match(/^win/)) { + config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86'; + } + } config.phjs = grunt.option('phjsToRelease');