CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 23:44:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check target with rustc directly

Browse Source 
To avoid depending on rustup (at least when not cross-compiling)
This commit is contained in:
David Baker 2021-07-06 19:01:34 +01:00
parent ad337b1f7c
commit 5bbce91e51
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hak/matrix-seshat/check.js
View File

@ -15,6 +15,7 @@ limitations under the License.
*/ */
const childProcess = require('child_process'); const childProcess = require('child_process');
const fsProm = require('fs').promises;
module.exports = async function(hakEnv, moduleInfo) { module.exports = async function(hakEnv, moduleInfo) {
// of course tcl doesn't have a --version // of course tcl doesn't have a --version
@ -61,17 +62,15 @@ module.exports = async function(hakEnv, moduleInfo) {
}); });
} }
// Ensure Rust target exists // Ensure Rust target exists (nb. we avoid depending on rustup)
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
childProcess.execFile('rustup', ['target', 'list', '--installed'], (err, out) => { const rustc = childProcess.execFile('rustc', ['--target', hakEnv.getTargetId(), '-o', 'tmp', '-'], (err, out) => {
if (err) { if (err) {
reject("Can't find rustup"); reject("rustc can't build for target " + hakEnv.getTargetId() + ": ensure the correct toolchain is installed");
} }
const target = hakEnv.getTargetId(); fsProm.unlink('tmp').then(resolve);
if (!out.includes(target)) {
reject(`Rust target ${target} not installed`);
}
resolve();
}); });
rustc.stdin.write('fn main() {}');
rustc.stdin.end();
}); });
}; };