From f130ecdd304847fc7c0b182b97f1dfdc0b76a7d6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 17 Jul 2017 11:20:47 -0400 Subject: [PATCH] coqPackages.compcert: Recent compcert supports 64-bit architectures --- pkgs/development/compilers/compcert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 8086a9f9749..f519776b689 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + - (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); installTargets = "documentation install"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $lib/share/doc/compcert mv doc/html $lib/share/doc/compcert/ mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - mv backend cfrontend common cparser driver flocq x86 x86_32 lib \ + mv backend cfrontend common cparser driver flocq x86 x86_64 lib \ $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ '';