Author: ludo
Date: Tue May 3 22:38:52 2011
New Revision: 27126
URL: https://svn.nixos.org/websvn/nix/?rev=27126&sc=1
Log:
GMP: Use `--enable-fat' instead of tinkering with `config.guess'.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix
Tue May 3 21:51:18 2011 (r27125)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix
Tue May 3 22:38:52 2011 (r27126)
@@ -1,7 +1,8 @@
{stdenv, fetchurl, m4, cxx ? true, static ? false}:
let
- staticFlags = if static then " --enable-static --disable-shared" else "";
+ staticFlags = stdenv.lib.optionals static
+ [ "--enable-static" "--disable-shared" ];
in
stdenv.mkDerivation rec {
@@ -14,12 +15,12 @@
buildNativeInputs = [m4];
- # Prevent the build system from using sub-architecture-specific
- # instructions (e.g., SSE2 on i686).
- preConfigure = "ln -sf configfsf.guess config.guess";
+ configureFlags =
+ # Build a "fat binary", with routines for several sub-architectures (x86).
+ [ "--enable-fat" ]
- configureFlags = if cxx then "--enable-cxx" else "--disable-cxx" +
- staticFlags;
+ ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ])
+ ++ staticFlags;
dontDisableStatic = if static then true else false;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
