public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: don't complain about configure script not existing

Browse Source 
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.
This commit is contained in:
Charles Strahan 2016-03-31 02:56:18 -04:00 committed by Vladimír Čunát
parent 6c9ce23c00
commit bde82098b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/setup.sh
View File

@ -649,14 +649,14 @@ configurePhase() {
# Add --disable-dependency-tracking to speed up some builds. # Add --disable-dependency-tracking to speed up some builds.
if [ -z "$dontAddDisableDepTrack" ]; then 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" configureFlags="--disable-dependency-tracking $configureFlags"
fi fi
fi fi
# By default, disable static builds. # By default, disable static builds.
if [ -z "$dontDisableStatic" ]; then if [ -z "$dontDisableStatic" ]; then
if grep -q enable-static "$configureScript"; then if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
configureFlags="--disable-static $configureFlags" configureFlags="--disable-static $configureFlags"
fi fi
fi fi