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

compcert: build with Coq 8.11

Browse Source 
And fix installation of development files
(use upstream Makefile rules instead of ad-hoc commands).
This commit is contained in:
Vincent Laporte 2020-09-28 23:04:26 +02:00 committed by Vincent Laporte
parent c2bb4af48d
commit 9a913b5125
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/compilers/compcert/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper
, coq, ocamlPackages, coq2html , coq, ocamlPackages, coq2html
, tools ? stdenv.cc , tools ? stdenv.cc
}: }:
@ -21,11 +21,22 @@ stdenv.mkDerivation rec {
sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr";
}; };
patches = [
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch";
sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy";
})
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch";
sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc";
})
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = ocaml-pkgs ++ [ coq coq2html ]; buildInputs = ocaml-pkgs ++ [ coq coq2html ];
enableParallelBuilding = true; enableParallelBuilding = true;
patchPhase = '' postPatch = ''
substituteInPlace ./configure \ substituteInPlace ./configure \
--replace '{toolprefix}gcc' '{toolprefix}cc' --replace '{toolprefix}gcc' '{toolprefix}cc'
''; '';
@ -33,6 +44,7 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
./configure -clightgen \ ./configure -clightgen \
-prefix $out \ -prefix $out \
-coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \
-toolprefix ${tools}/bin/ \ -toolprefix ${tools}/bin/ \
${ccomp-platform} ${ccomp-platform}
''; '';
@ -47,12 +59,6 @@ stdenv.mkDerivation rec {
mkdir -p $doc/share/doc/compcert mkdir -p $doc/share/doc/compcert
mv doc/html $doc/share/doc/compcert/ mv doc/html $doc/share/doc/compcert/
# install compcert lib files; remove copy from $out, too
mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
mv backend cfrontend common cparser driver flocq x86 x86_64 lib \
$lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
rm -rf $out/lib/compcert/coq
# wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets
# _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should),
# which causes a warning in libc. this suppresses it. # which causes a warning in libc. this suppresses it.

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

@ -8560,9 +8560,7 @@ in
cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
compcert = callPackage ../development/compilers/compcert { compcert = callPackage ../development/compilers/compcert {};
inherit (coqPackages_8_10) coq;
};
computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp-unwrapped = callPackage ../development/compilers/computecpp {};
computecpp = wrapCCWith rec { computecpp = wrapCCWith rec {