From e25150bb106edd69db3e4a831044ca4cac6f33b3 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 22:18:47 -0500 Subject: [PATCH] No need for this hack anymore --- pkgs/development/libraries/pcre/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 768e87f5ad2..77d21abb6d2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -12,15 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg"; }; - # The compiler on Darwin crashes with an internal error while building the - # C++ interface. Disabling optimizations on that platform remedies the - # problem. In case we ever update the Darwin GCC version, the exception for - # that platform ought to be removed. configureFlags = '' --enable-jit ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - '' + optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + ''; doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin