From 061874a334dfd458e164e9ec34081fe86b3261bf Mon Sep 17 00:00:00 2001
From: Dave Herman <dherman@mozilla.com>
Date: Sun, 8 Jan 2017 13:56:09 -0800
Subject: [PATCH] Roll back #37 for now. I'll file an issue to eliminate the
 NEON_NODE_ABI environment variable as part of the 0.2 release, whenever that
 happens. For now it doesn't really hurt to keep compatibility.

---
 src/ops/neon_build.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ops/neon_build.js b/src/ops/neon_build.js
index 3e5daeb7a..12b5c145a 100644
--- a/src/ops/neon_build.js
+++ b/src/ops/neon_build.js
@@ -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) {