diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-02 13:24:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-02 13:24:12 +0000 |
| commit | 448b75b87b1e0977149754edd9b3edca27c2f42d (patch) | |
| tree | ae9d8968e526e61157d03f2665d5ef746e710864 | |
| parent | 5e5ce5a987bd044459c19b393884a348e9d1f0b3 (diff) | |
| download | nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar.gz nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar.bz2 nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar.lz nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar.xz nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.tar.zst nixpkgs-448b75b87b1e0977149754edd9b3edca27c2f42d.zip | |
Removing a fix made for gcc 4.3 in php expression. Now it builds with -O2 as usual, instead of -O1.
svn path=/nixpkgs/trunk/; revision=24570
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3f3efa78275..8277021b0dc 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -134,13 +134,11 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { gdSupport = getConfig ["php" "gd"] true; }; - # only -O1 configurePhase = '' iniFile=$out/etc/php-recommended.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end - sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3 ''; installPhase = '' |