Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  iOS fix
  Remove '*.cmake' pattern from .gitignore
This commit is contained in:
Frank Denis 2018-08-23 10:18:06 +02:00
commit 05446caf33
2 changed files with 8 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
*.bc *.bc
*.cmake
*.dSYM *.dSYM
*.done *.done
*.final *.final

View File

@ -108,12 +108,16 @@ if [ "$DIST" = yes ]; then
reject(err); reject(err);
} }
}; };
Module.useBackupModule = function () {
var Module = _Module;
Module.onAbort = undefined;
Module.onRuntimeInitialized = undefined;
Module.useBackupModule = undefined;
$(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g')
};
$(cat "${PREFIX}/lib/libsodium.wasm.tmp.js") $(cat "${PREFIX}/lib/libsodium.wasm.tmp.js")
}).catch(function () { }).catch(function () {
var Module = _Module; _Module.useBackupModule();
Module.onAbort = undefined;
Module.onRuntimeInitialized = undefined;
$(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g')
}); });
EOM EOM