mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
GMP: Use --enable-fat' instead of tinkering with
config.guess'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=27126
This commit is contained in:
parent
8aa7d7b1ac
commit
d00b303766
@ -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 @@ stdenv.mkDerivation rec {
|
||||
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user