summaryrefslogtreecommitdiff
path: root/node.gyp
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2015-01-08 13:05:51 +0100
committerBert Belder <bertbelder@gmail.com>2015-01-08 14:17:24 +0100
commite1fe270fd7788836b562cf0ddf179584c2ec9bdf (patch)
tree6a1ce91fb416d36c546195e062aa61d86166c7a1 /node.gyp
parent858b5583456ef74fadbd9eca691e546b1c11eb16 (diff)
downloadandroid-node-v8-e1fe270fd7788836b562cf0ddf179584c2ec9bdf.tar.gz
android-node-v8-e1fe270fd7788836b562cf0ddf179584c2ec9bdf.tar.bz2
android-node-v8-e1fe270fd7788836b562cf0ddf179584c2ec9bdf.zip
src: prefix ARCH and PLATFORM with NODE_
The PLATFORM preprocessor symbol is defined in node.gyp, and on Windows it's set to "win". This conflicts with a built-in preprocessor symbol with a different value ("win32"), which makes the linker(!) complain. Resolve this by renaming these symbols to NODE_ARCH and NODE_PLATFORM. PR-URL: https://github.com/iojs/io.js/pull/261 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'node.gyp')
-rw-r--r--node.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node.gyp b/node.gyp
index 10ca1bc2b5..30a1bdf7eb 100644
--- a/node.gyp
+++ b/node.gyp
@@ -164,11 +164,11 @@
],
'defines': [
- 'NODE_WANT_INTERNALS=1',
- 'ARCH="<(target_arch)"',
- 'PLATFORM="<(OS)"',
+ 'NODE_ARCH="<(target_arch)"',
+ 'NODE_PLATFORM="<(OS)"',
'NODE_TAG="<(node_tag)"',
'NODE_V8_OPTIONS="<(node_v8_options)"',
+ 'NODE_WANT_INTERNALS=1',
],
'conditions': [