diff options
| author | Charles Strahan <charles@cstrahan.com> | 2016-03-31 02:56:18 -0400 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-02 20:52:19 +0200 |
| commit | bde82098b88861a27faadc8a69b597510e56d846 (patch) | |
| tree | a2cd1ba6442e897b62cd5dda092186ed059453b4 /pkgs | |
| parent | 6c9ce23c00be88447a8b4d436025508001717b28 (diff) | |
| download | nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar.gz nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar.bz2 nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar.lz nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar.xz nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.tar.zst nixpkgs-bde82098b88861a27faadc8a69b597510e56d846.zip | |
stdenv: don't complain about configure script not existing
Close #14335.
Since 89036ef76ab09a, when a package doesn't include a configure script,
the build complains with:
grep: : No such file or directory
grep: : No such file or directory
This prevents that.
Diffstat (limited to 'pkgs')
| -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 |