From bde82098b88861a27faadc8a69b597510e56d846 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 31 Mar 2016 02:56:18 -0400 Subject: 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. --- pkgs/stdenv/generic/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/stdenv/generic') diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 97eb855d3594..cca4648d2375 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 -- cgit 1.4.1