From f001d223fa0728c824ebf1edd7becefb403cab95 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 11 Jul 2016 20:40:50 -0400
Subject: [PATCH] Rebuild binary npm packages used by compiler plugins, too.

Fixes #7297.
---
 tools/isobuild/bundler.js |  6 +++++-
 tools/isobuild/isopack.js | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index c13ad758a1..9d9ccd818a 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1953,6 +1953,9 @@ class JsImage {
 
     ret.arch = json.arch;
 
+    // Rebuild binary npm packages if unibuild arch matches host arch.
+    const rebuildBinaries = archinfo.matches(archinfo.host(), ret.arch);
+
     _.each(json.load, function (item) {
       rejectBadPath(item.path);
 
@@ -1962,7 +1965,8 @@ class JsImage {
           ret.nodeModulesDirectories,
           nodeModulesDirectories =
             NodeModulesDirectory.readDirsFromJSON(item.node_modules, {
-              sourceRoot: dir
+              sourceRoot: dir,
+              rebuildBinaries,
             })
         );
       }
diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js
index 1f8da417a7..ce98fba763 100644
--- a/tools/isobuild/isopack.js
+++ b/tools/isobuild/isopack.js
@@ -1085,13 +1085,17 @@ _.extend(Isopack.prototype, {
         }
       });
 
+      // Rebuild binary npm packages if unibuild arch matches host arch.
+      const rebuildBinaries = archinfo.matches(
+        archinfo.host(),
+        unibuildMeta.arch
+      );
+
       const nodeModulesDirectories = bundler.NodeModulesDirectory
         .readDirsFromJSON(unibuildJson.node_modules, {
           packageName: self.name,
           sourceRoot: unibuildBasePath,
-          // Rebuild binaries if unibuild arch matches host arch.
-          rebuildBinaries: archinfo.matches(
-            archinfo.host(), unibuildMeta.arch)
+          rebuildBinaries,
         });
 
       self.unibuilds.push(new Unibuild(self, {