From dc6a585991ad77c6d877e7124381600a57525040 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Mon, 7 Sep 2015 10:53:02 +0100 Subject: [PATCH] binding.gyp.cmake: Fix npm builds for ia32 node.js 0.10.x Node.js 0.10.x seems to struggle with the 'or' directive. Fixes #272 Signed-off-by: Brendan Le Foll --- src/javascript/binding.gyp.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/javascript/binding.gyp.cmake b/src/javascript/binding.gyp.cmake index ffab094..8fecc19 100644 --- a/src/javascript/binding.gyp.cmake +++ b/src/javascript/binding.gyp.cmake @@ -16,9 +16,12 @@ 'cflags_cc!': [ '-fno-rtti', '-fno-exceptions' ], 'cflags!': [ '-fno-exceptions' ], 'conditions' : [ - [ 'arch=="x64"' or 'arch=="ia32"', + [ 'arch=="x64"', { 'defines' : [ 'X86PLAT=ON' ], }, ], + [ 'arch=="ia32"', + { 'defines' : [ 'X86PLAT=ON'], }, + ], [ 'arch=="arm"', { 'defines' : [ 'ARMPLAT=ON'], }, ],