From 386746c7d1be92dbf08c89c0d74c1306df832b94 Mon Sep 17 00:00:00 2001 From: Pavel Medvedev Date: Thu, 23 Jun 2016 13:58:52 +0300 Subject: [PATCH] configure: use full path in node_lib_file GYP var MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set path to node lib in `$(Configuration)` dir when `--nodedir` option is supplied, otherwise use value of `target_arch` variable. PR-URL: https://github.com/nodejs/node-gyp/pull/964 Reviewed-By: João Reis --- addon.gypi | 2 +- lib/configure.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addon.gypi b/addon.gypi index 6dd0873fa4..f2f6a7925e 100644 --- a/addon.gypi +++ b/addon.gypi @@ -109,7 +109,7 @@ '-luuid.lib', '-lodbc32.lib', '-lDelayImp.lib', - '-l"<(node_root_dir)/<(target_arch)/<(node_lib_file)"' + '-l"<(node_lib_file)"' ], 'msvs_disabled_warnings': [ # warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent' diff --git a/lib/configure.js b/lib/configure.js index 90a03b1201..1351576d12 100644 --- a/lib/configure.js +++ b/lib/configure.js @@ -283,6 +283,9 @@ function configure (gyp, argv, callback) { output_dir = buildDir } var nodeGypDir = path.resolve(__dirname, '..') + var nodeLibFile = path.join(nodeDir, + !gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)', + release.name + '.lib') argv.push('-I', addon_gypi) argv.push('-I', common_gypi) @@ -293,7 +296,7 @@ function configure (gyp, argv, callback) { argv.push('-Dnode_exp_file=' + node_exp_file) } argv.push('-Dnode_gyp_dir=' + nodeGypDir) - argv.push('-Dnode_lib_file=' + release.name + '.lib') + argv.push('-Dnode_lib_file=' + nodeLibFile) argv.push('-Dmodule_root_dir=' + process.cwd()) argv.push('-Dnode_engine=' + (gyp.opts.node_engine || process.jsEngine || 'v8'))