From c57a173649928c810ca85d7363a0e5d872e858f2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 22 Jun 2021 13:37:33 +0100
Subject: [PATCH] Check for Rust host and target support

---
 hak/matrix-seshat/check.js | 21 +++++++++++++++++++--
 scripts/hak/hakEnv.js      |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/hak/matrix-seshat/check.js b/hak/matrix-seshat/check.js
index ad58a8e..c8695dc 100644
--- a/hak/matrix-seshat/check.js
+++ b/hak/matrix-seshat/check.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +34,10 @@ module.exports = async function(hakEnv, moduleInfo) {
         });
     }
 
-    const tools = [['python', '--version']]; // node-gyp uses python for reasons beyond comprehension
+    const tools = [
+        ['rustc', '--version'],
+        ['python', '--version'], // node-gyp uses python for reasons beyond comprehension
+    ];
     if (hakEnv.isWin()) {
         tools.push(['perl', '--version']); // for openssl configure
         tools.push(['patch', '--version']); // to patch sqlcipher Makefile.msc
@@ -57,4 +60,18 @@ module.exports = async function(hakEnv, moduleInfo) {
             });
         });
     }
+
+    // Ensure Rust target exists
+    await new Promise((resolve, reject) => {
+        childProcess.execFile('rustup', ['target', 'list', '--installed'], (err, out) => {
+            if (err) {
+                reject("Can't find rustup");
+            }
+            const target = hakEnv.getRustTarget();
+            if (!out.includes(target)) {
+                reject(`Rust target ${target} not installed`);
+            }
+            resolve();
+        });
+    });
 };
diff --git a/scripts/hak/hakEnv.js b/scripts/hak/hakEnv.js
index 7ccd32f..7a4f2e7 100644
--- a/scripts/hak/hakEnv.js
+++ b/scripts/hak/hakEnv.js
@@ -80,6 +80,10 @@ module.exports = class HakEnv {
         return this.getRuntimeAbi() + '-' + this.target.platform + '-' + this.target.arch;
     }
 
+    getRustTarget() {
+        return this.target.id;
+    }
+
     isWin() {
         return this.target.platform === 'win32';
     }