diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-06 01:18:28 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-06 01:18:28 +0300 |
| commit | 6b42f9f4be55e5b7b3c20c64dac0a95f60d29037 (patch) | |
| tree | 5e269ac22fb47a65621516b1e20dc58125b72cee /pkgs/stdenv | |
| parent | 7ec55f3754018f4b25d682baea449d3fe3da1046 (diff) | |
| parent | bde82098b88861a27faadc8a69b597510e56d846 (diff) | |
| download | nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar.gz nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar.bz2 nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar.lz nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar.xz nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.tar.zst nixpkgs-6b42f9f4be55e5b7b3c20c64dac0a95f60d29037.zip | |
Merge commit 'bde820' from staging
http://hydra.nixos.org/eval/1252653 - only ~9400 packages to go at the time of writing this.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 97eb855d359..cca4648d237 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -649,14 +649,14 @@ configurePhase() { # Add --disable-dependency-tracking to speed up some builds. if [ -z "$dontAddDisableDepTrack" ]; then - if grep -q dependency-tracking "$configureScript"; then + if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then configureFlags="--disable-dependency-tracking $configureFlags" fi fi # By default, disable static builds. if [ -z "$dontDisableStatic" ]; then - if grep -q enable-static "$configureScript"; then + if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then configureFlags="--disable-static $configureFlags" fi fi |