compcert: build with 64-bit compiler, add darwin support

This commit is contained in:
John Wiegley 2014-07-01 16:43:27 -05:00
parent b8cb960a58
commit 8d5c4e8b4b
2 changed files with 7 additions and 4 deletions

View File

@ -12,13 +12,16 @@ stdenv.mkDerivation rec {
buildInputs = [ coq ocaml ocamlPackages.menhir ];
enableParallelBuilding = true;
configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";
configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " +
(if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
meta = {
description = "Formally verified C compiler";
homepage = "http://compcert.inria.fr";
license = stdenv.lib.licenses.inria;
platforms = [ "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
platforms = [ stdenv.lib.platforms.linux
stdenv.lib.platforms.darwin ];
maintainers = [ stdenv.lib.maintainers.thoughtpolice
stdenv.lib.maintainers.jwiegley ];
};
}

View File

@ -2568,7 +2568,7 @@ let
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
compcert = callPackage_i686 ../development/compilers/compcert {};
compcert = callPackage ../development/compilers/compcert {}
cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
cryptol2 = haskellPackages.cryptol;