diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
| commit | fca582bff0ab8887835ca10495620d0ac15ab10a (patch) | |
| tree | 0934656b725b9a5da0acb8025f3a9ceab2e63d90 /pkgs/development/libraries/pcre | |
| parent | 2291f661b03f29fd59549165721a1426e5d04264 (diff) | |
| parent | 89a3dc9adac5aa195ec9334c2f7e255e02388157 (diff) | |
| download | nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.gz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.bz2 nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.lz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.xz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.zst nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.zip | |
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
Diffstat (limited to 'pkgs/development/libraries/pcre')
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index ccef9d08f734..65eb51af9b00 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,10 +13,9 @@ stdenv.mkDerivation { # problem. In case we ever update the Darwin GCC version, the exception for # that platform ought to be removed. configureFlags = '' - CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; doCheck = true; |