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

Use the target-specific build dir for sqlcipher / openssl

Browse Source
This commit is contained in:
David Baker 2021-07-09 10:07:07 +01:00
parent fac9f53bb6
commit bd85f19c15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hak/matrix-seshat/fetchDeps.js
View File

@ -34,7 +34,7 @@ module.exports = async function(hakEnv, moduleInfo) {
async function getSqlCipher(hakEnv, moduleInfo) { async function getSqlCipher(hakEnv, moduleInfo) {
const version = moduleInfo.cfg.dependencies.sqlcipher; const version = moduleInfo.cfg.dependencies.sqlcipher;
const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`); const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
let haveSqlcipher; let haveSqlcipher;
try { try {
@ -95,7 +95,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
async function getOpenSsl(hakEnv, moduleInfo) { async function getOpenSsl(hakEnv, moduleInfo) {
const version = moduleInfo.cfg.dependencies.openssl; const version = moduleInfo.cfg.dependencies.openssl;
const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`); const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
let haveOpenSsl; let haveOpenSsl;
try { try {
@ -122,7 +122,7 @@ async function getOpenSsl(hakEnv, moduleInfo) {
}); });
} }
console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleDotHakDir); console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);
await tar.x({ await tar.x({
file: openSslTarball, file: openSslTarball,
cwd: moduleInfo.moduleTargetDotHakDir, cwd: moduleInfo.moduleTargetDotHakDir,