From ac98e13b95c3f8bf255947576e04a093308cb9f1 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Sat, 5 Sep 2015 14:41:34 +1000 Subject: [PATCH] src: s/ia32/x86 for process.release.libUrl for win PR-URL: https://github.com/nodejs/node/pull/2699 Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Alexis Campailla --- src/node.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/node.cc b/src/node.cc index e6e29b8f001e19..7075d28f68a24c 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2760,22 +2760,25 @@ void SetupProcessObject(Environment* env, #endif #if defined(NODE_RELEASE_URLBASE) -# define _RELEASE_URLPFX NODE_RELEASE_URLBASE "v" NODE_VERSION_STRING "/" -# define _RELEASE_URLFPFX _RELEASE_URLPFX "iojs-v" NODE_VERSION_STRING +# define NODE_RELEASE_URLPFX NODE_RELEASE_URLBASE "v" NODE_VERSION_STRING "/" +# define NODE_RELEASE_URLFPFX NODE_RELEASE_URLPFX "iojs-v" NODE_VERSION_STRING READONLY_PROPERTY(release, "sourceUrl", OneByteString(env->isolate(), - _RELEASE_URLFPFX ".tar.gz")); + NODE_RELEASE_URLFPFX ".tar.gz")); READONLY_PROPERTY(release, "headersUrl", OneByteString(env->isolate(), - _RELEASE_URLFPFX "-headers.tar.gz")); + NODE_RELEASE_URLFPFX "-headers.tar.gz")); # ifdef _WIN32 READONLY_PROPERTY(release, "libUrl", OneByteString(env->isolate(), - _RELEASE_URLPFX "win-" NODE_ARCH "/iojs.lib")); + strcmp(NODE_ARCH, "ia32") ? NODE_RELEASE_URLPFX "win-" + NODE_ARCH "/iojs.lib" + : NODE_RELEASE_URLPFX + "win-x86/iojs.lib")); # endif #endif