From 2cb32f791c2ea052de1e3556abaa26bcbf33ecae Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Wed, 3 Jun 2015 14:40:51 +0100 Subject: [PATCH] binding.gyp.cmake: fix compilation when not setting target_arch NPM package now only builds x86 builds, but for npm those are the only ones that have ever worked due to a rework of the cmake code generating the binding.gyp file is required Signed-off-by: Brendan Le Foll --- src/javascript/binding.gyp.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/javascript/binding.gyp.cmake b/src/javascript/binding.gyp.cmake index 8dcb489..d7e882b 100644 --- a/src/javascript/binding.gyp.cmake +++ b/src/javascript/binding.gyp.cmake @@ -18,18 +18,8 @@ 'SWIGJAVASCRIPT', 'BUILDING_NODE_EXTENSION=1', 'SWIG_V8_VERSION=0x0<(v8_version)', - 'V8_VERSION=0x0<(v8_version)' ], - 'conditions' : [ - [ 'target_arch=="x64"', - { 'defines' : [ 'X86PLAT=ON' ], }, - ], - [ 'target_arch=="ia32"', - { 'defines' : [ 'X86PLAT=ON' ], }, - ], - [ 'target_arch=="arm"', - { 'defines' : [ 'ARMPLAT=ON' ], }, - ], - ], + 'V8_VERSION=0x0<(v8_version)', + 'X86PLAT=ON' ] } ] } -- 2.7.4