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

emscriptenfastcomp: build using cmake and use cc-wrapper

This commit is contained in:
Gabriel Ebner 2016-12-31 19:13:02 +01:00
parent 1fa75a5bb7
commit db0120dea2
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/development/compilers/emscripten-fastcomp/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python }: { stdenv, fetchFromGitHub, cmake, python, ... }:
let let
rev = "1.36.4"; rev = "1.36.4";
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emscripten-fastcomp-${rev}"; name = "emscripten-fastcomp-${rev}";
srcFC = fetchFromGitHub { src = fetchFromGitHub {
owner = "kripken"; owner = "kripken";
repo = "emscripten-fastcomp"; repo = "emscripten-fastcomp";
sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l"; sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l";
@ -21,24 +21,32 @@ stdenv.mkDerivation rec {
inherit rev; inherit rev;
}; };
buildInputs = [ python ]; nativeBuildInputs = [ cmake python ];
buildCommand = '' preConfigure = ''
cp -as ${srcFC} $TMPDIR/src cp -Lr ${srcFL} tools/clang
chmod +w $TMPDIR/src/tools chmod +w -R tools/clang
cp -as ${srcFL} $TMPDIR/src/tools/clang
chmod +w $TMPDIR/src
mkdir $TMPDIR/src/build
cd $TMPDIR/src/build
../configure --enable-optimized --disable-assertions --enable-targets=host,js
make
cp -a Release/bin $out
''; '';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
"-DLLVM_INCLUDE_EXAMPLES=OFF"
"-DLLVM_INCLUDE_TESTS=OFF"
# "-DCLANG_INCLUDE_EXAMPLES=OFF"
"-DCLANG_INCLUDE_TESTS=OFF"
] ++ (stdenv.lib.optional stdenv.isLinux
# necessary for clang to find crtend.o
"-DGCC_INSTALL_PREFIX=${gcc}"
);
enableParallelBuilding = true;
passthru = {
isClang = true;
inherit gcc;
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten-fastcomp; homepage = https://github.com/kripken/emscripten-fastcomp;
description = "Emscripten llvm"; description = "Emscripten LLVM";
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ qknight matthewbauer ]; maintainers = with maintainers; [ qknight matthewbauer ];
license = stdenv.lib.licenses.ncsa; license = stdenv.lib.licenses.ncsa;

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

@ -27,7 +27,7 @@ stdenv.mkDerivation {
ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/${appdir}/config echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config
echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config

13
pkgs/top-level/all-packages.nix
View File

@ -1555,7 +1555,18 @@ in
emscripten = callPackage ../development/compilers/emscripten { }; emscripten = callPackage ../development/compilers/emscripten { };
emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped;
emscriptenfastcomp = symlinkJoin {
name = "emscriptenfastcomp";
paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];
preferLocalBuild = false;
allowSubstitutes = true;
postBuild = ''
# replace unwrapped clang-3.9 binary by wrapper
ln -sf $out/bin/clang $out/bin/clang-[0-9]*
'';
};
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });