ocaml-llvm: 3.7.1 -> 3.9.1

This commit is contained in:
Vincent Laporte 2017-03-12 18:22:01 +00:00 committed by vbgl
parent b2c96062ca
commit b2b8a412fb
2 changed files with 14 additions and 12 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, python, llvm, ocaml, findlib, ctypes }:
{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
let version = stdenv.lib.getVersion llvm; in
@ -7,21 +7,23 @@ stdenv.mkDerivation {
inherit (llvm) src;
buildInputs = [ python llvm ocaml findlib ctypes ];
buildInputs = [ python cmake llvm ocaml findlib ctypes ];
configurePhase = ''
mkdir build
cd build
../configure --disable-compiler-version-checks --prefix=$out \
--disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \
--enable-static
'';
patches = [ (fetchpatch {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
})];
enableParallelBuilding = false;
cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
makeFlags = [ "-C bindings" "SYSTEM_LLVM_CONFIG=llvm-config" ];
buildFlags = "ocaml_all";
installFlags = "-C bindings/ocaml";
postInstall = ''
mv $out/lib/ocaml $out/ocaml
mkdir -p $OCAMLFIND_DESTDIR/
mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
'';

View File

@ -261,7 +261,7 @@ let
else lambdaTerm-1_6;
llvm = callPackage ../development/ocaml-modules/llvm {
llvm = pkgs.llvm_37;
llvm = pkgs.llvm_39;
};
logs = callPackage ../development/ocaml-modules/logs {