Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-07-04 05:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set rust toolchain appropriately

Browse source
This commit is contained in:
David Baker 2020-02-18 11:37:27 +00:00
parent 69a30fb9d0
commit 84aa8c10c1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hak/matrix-seshat/build.js
View file

@ -240,6 +240,12 @@ async function buildMatrixSeshat(hakEnv, moduleInfo) {
if (hakEnv.isWin()) {
env.RUSTFLAGS = '-Ctarget-feature=+crt-static -Clink-args=libcrypto.lib';
// Note that in general, you can specify targets in Rust without having to have
// the matching toolchain, however for this, cargo gets confused when building
// the build scripts since they run on the host, but vcvarsall.bat sets the c
// compiler in the path to be the one for the target, so we just use the matching
// toolchain for the target architecture which makes everything happy.
env.RUSTUP_TOOLCHAIN = hakEnv.arch == 'x64' ? 'stable-x86_64-pc-windows-msvc' : 'stable-i686-pc-windows-msvc';
}
console.log("Running neon with env", env);