From 4cb43d2a756449c43e6ce4713b0eb8169591597f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 28 May 2014 01:35:31 -0500 Subject: [PATCH] Build ppl and gmp correctly for building gcc48 on darwin --- pkgs/development/libraries/gmp/5.1.x.nix | 3 ++- pkgs/development/libraries/ppl/default.nix | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a25eabbee86e..53d7f4585659 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { # (x86), except on Solaris where some tests crash with "Memory fault". # See , 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; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index cbdb7b128b45..2c22317a6ca7 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -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 ];