Author: ludo
Date: Sat Jan 22 20:26:50 2011
New Revision: 25668
URL: https://svn.nixos.org/websvn/nix/?rev=25668&sc=1
Log:
GMP: Further attempt to fix `x86_64-darwin' builds.
Modified:
nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix Sat Jan 22 12:28:59
2011 (r25667)
+++ nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix Sat Jan 22 20:26:50
2011 (r25668)
@@ -16,7 +16,14 @@
# Prevent the build system from using sub-architecture-specific
# 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") +
staticFlags;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 22 12:28:59
2011 (r25667)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 22 20:26:50
2011 (r25668)
@@ -3120,7 +3120,7 @@
gmm = callPackage ../development/libraries/gmm { };
gmp =
- if stdenv.isDarwin then
+ if stdenv.system == "i686-darwin" then
# GMP 4.3.2 is broken on Darwin, so use 4.3.1.
makeOverridable (import ../development/libraries/gmp/4.3.1.nix) {
inherit stdenv fetchurl m4;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
