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

Merge pull request #2522 from jwiegley/ppl

Browse Source 
Build ppl and gmp correctly for building gcc48 on darwin
This commit is contained in:
John Wiegley 2014-05-31 17:02:01 -05:00
commit 439482cfc1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
# (x86), except on Solaris where some tests crash with "Memory fault".
# See <http://hydra.nixos.org/build/2760931>, for instance.
(stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat")
++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ])
++ (if cxx then [ "--enable-cxx" "CPPFLAGS=-fexceptions" ]
else [ "--disable-cxx" ])
++ (if stdenv.is64bit then [ "--with-pic" ] else []);
doCheck = true;

5
pkgs/development/libraries/ppl/default.nix
View File

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl gnum4 ];
propagatedBuildInputs = [ gmpxx ];
configureFlags = "--disable-watchdog";
configureFlags = [ "--disable-watchdog" "CPPFLAGS=-fexceptions" ] ++
stdenv.lib.optionals stdenv.isDarwin [
"--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
];
patches = [ ./upstream-based.patch ];