Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-09 15:03:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #225 from vector-im/dbkr/no_rustup

Browse source 
Check target with rustc directly
This commit is contained in:
David Baker 2021-07-07 11:00:43 +01:00 committed by GitHub
commit eed1252f33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hak/matrix-seshat/check.js
View file

@ -15,6 +15,7 @@ limitations under the License.
*/
const childProcess = require('child_process');
const fsProm = require('fs').promises;
module.exports = async function(hakEnv, moduleInfo) {
// of course tcl doesn't have a --version
@ -61,17 +62,21 @@ 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) => {
childProcess.execFile('rustup', ['target', 'list', '--installed'], (err, out) => {
const rustc = childProcess.execFile('rustc', [
'--target', hakEnv.getTargetId(), '-o', 'tmp', '-',
], (err, out) => {
if (err) {
reject("Can't find rustup");
reject(
"rustc can't build for target " + hakEnv.getTargetId() +
": ensure target is installed via `rustup target add " + hakEnv.getTargetId() + "` " +
"or your package manager if not using `rustup`",
);
}
const target = hakEnv.getTargetId();
if (!out.includes(target)) {
reject(`Rust target ${target} not installed`);
}
resolve();
fsProm.unlink('tmp').then(resolve);
});
rustc.stdin.write('fn main() {}');
rustc.stdin.end();
});
};