public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emscripten: precompile libc, etc.

Browse Source
This commit is contained in:
Gabriel Ebner 2020-08-29 12:51:38 +02:00
parent 3f30e70d29
commit bc9760b842
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/compilers/emscripten/default.nix
View File

@ -37,18 +37,25 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
# fixes cmake support # fixes cmake support
sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
# disables cache in user home, use installation directory instead
sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py
sed -i "/^def check_sanity/a\\ return" tools/shared.py
# required for wasm2c
ln -s ${nodeModules}/node_modules .
echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten
echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
echo "JS_ENGINES = [NODE_JS]" >> .emscripten echo "JS_ENGINES = [NODE_JS]" >> .emscripten
echo "COMPILER_ENGINE = NODE_JS" >> .emscripten echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten
echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> .emscripten
echo "JAVA = '${jre}/bin/java'" >> .emscripten echo "JAVA = '${jre}/bin/java'" >> .emscripten
# to make the test(s) below work # to make the test(s) below work
echo "SPIDERMONKEY_ENGINE = []" >> .emscripten # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten
echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten
''; '';
@ -61,16 +68,21 @@ stdenv.mkDerivation rec {
for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do
makeWrapper $appdir/$b $out/bin/$b \ makeWrapper $appdir/$b $out/bin/$b \
--set NODE_PATH ${nodeModules}/node_modules \ --set NODE_PATH ${nodeModules}/node_modules \
--set EM_EXCLUSIVE_CACHE_ACCESS 1 \
--set PYTHON ${python3}/bin/python --set PYTHON ${python3}/bin/python
done done
'';
doCheck = true; # precompile libc in all four variants:
checkPhase = '' # wasm, wasm-pic, wasm-lto, wasm-lto-pic
#export EMCC_DEBUG=2
export PYTHON=${python3}/bin/python export PYTHON=${python3}/bin/python
export HOME=$TMPDIR export NODE_PATH=${nodeModules}/node_modules
python tests/runner.py test_hello_world pushd $appdir
for lto in wasm2 wasmlto2; do
for pic in test_hello_world test_relocatable_void_function; do
python tests/runner.py $lto.$pic
done
done
popd
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

1
pkgs/development/tools/parsing/tree-sitter/default.nix
View File

@ -65,7 +65,6 @@ in rustPlatform.buildRustPackage {
# minifying the JavaScript; passing it allows us to side-step more Node # minifying the JavaScript; passing it allows us to side-step more Node
# JS dependencies for installation. # JS dependencies for installation.
preBuild = '' preBuild = ''
HOME=/tmp
bash ./script/build-wasm --debug bash ./script/build-wasm --debug
''; '';