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

GMP: Further attempt to fix `x86_64-darwin' builds.

Browse Source 
svn path=/nixpkgs/trunk/; revision=25668
This commit is contained in:
Ludovic Courtès 2011-01-22 20:26:50 +00:00
parent 24c9b1f3b9
commit 3593d48524
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gmp/4.nix
View File

@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
# Prevent the build system from using sub-architecture-specific # Prevent the build system from using sub-architecture-specific
# instructions (e.g., SSE2 on i686). # instructions (e.g., SSE2 on i686).
preConfigure = "ln -sf configfsf.guess config.guess"; #
# This is not a problem for Apple machines, which are all alike. In
# addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on
# `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable.
preConfigure =
if !stdenv.isDarwin
then "ln -sf configfsf.guess config.guess"
else ''echo "Darwin host is `./config.guess`."'';
configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") + configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
staticFlags; staticFlags;

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

@ -3120,7 +3120,7 @@ let
gmm = callPackage ../development/libraries/gmm { }; gmm = callPackage ../development/libraries/gmm { };
gmp = gmp =
if stdenv.isDarwin then if stdenv.system == "i686-darwin" then
# GMP 4.3.2 is broken on Darwin, so use 4.3.1. # GMP 4.3.2 is broken on Darwin, so use 4.3.1.
makeOverridable (import ../development/libraries/gmp/4.3.1.nix) { makeOverridable (import ../development/libraries/gmp/4.3.1.nix) {
inherit stdenv fetchurl m4; inherit stdenv fetchurl m4;