diff options
| author | Danny Wilson <danny@prime.vc> | 2013-02-23 13:59:59 +0000 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-02-28 20:04:02 +0100 |
| commit | 15e865ac09c93093c9cada2f247b14dba084c71a (patch) | |
| tree | 352ed3af8ac0f5234e03be2d35c75899afa422a6 /pkgs/development/libraries/mpfr | |
| parent | bcaea92a1217f6adb79bdb400f2bfffef97955ed (diff) | |
| download | nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar.gz nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar.bz2 nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar.lz nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar.xz nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.tar.zst nixpkgs-15e865ac09c93093c9cada2f247b14dba084c71a.zip | |
GCC 4.7.2 + updated libraries compiles on Illumos/SmartOS!
- Add solaris native ld support to GCC build wrapper - Add solaris ld wrapper that fixes -L argument order
Diffstat (limited to 'pkgs/development/libraries/mpfr')
| -rw-r--r-- | pkgs/development/libraries/mpfr/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 802fd93f8cf..6fbb6253ee5 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, gmp}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "mpfr-3.1.1"; src = fetchurl { @@ -35,16 +35,14 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; -} -// - -(stdenv.lib.optionalAttrs (stdenv.isSunOS or stdenv.isFreeBSD) { - /* Work around a FreeBSD bug that otherwise leads to segfaults in - the test suite: - http://hydra.bordeaux.inria.fr/build/34862 - http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html - http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 - */ - configureFlags = [ "--disable-thread-safe" ]; - })) + configureFlags = + /* Work around a FreeBSD bug that otherwise leads to segfaults in + the test suite: + http://hydra.bordeaux.inria.fr/build/34862 + http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html + http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 + */ + stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++ + stdenv.lib.optional stdenv.is64bit "--with-pic"; +} |