Skip to content

Commit

Permalink
Roll back #37 for now. I'll file an issue to eliminate the NEON_NODE_…
Browse files Browse the repository at this point in the history
…ABI environment variable as part of the 0.2 release, whenever that happens. For now it doesn't really hurt to keep compatibility.
  • Loading branch information
Dave Herman committed Jan 8, 2017
1 parent a9f42b9 commit 061874a
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/ops/neon_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ function cargo(toolchain, configuration, nodeModuleVersion) {
configuration === 'release' ? ["--release"] : [],
macos ? ["--", "-C", "link-args=-Wl,-undefined,dynamic_lookup"] : []);

// Save the current Node ABI version as an environment variable.
let env = clone(process.env);
if (nodeModuleVersion) {
env.NEON_NODE_ABI = nodeModuleVersion;
}

console.log(style.info([command].concat(args).join(" ")));

return spawn(command, args, { cwd: 'native', stdio: 'inherit' });
return spawn(command, args, { cwd: 'native', stdio: 'inherit', env: env });
}

async function main(name, configuration) {
Expand Down

0 comments on commit 061874a

Please sign in to comment.