From 06688b73ca661c0d7daa09355abc10c694164943 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 28 Jun 2021 22:43:23 +0900 Subject: [PATCH] setup.sh: separate command from combined conditional --- pkgs/stdenv/generic/setup.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index aa1e23f2666..0db3a3f1254 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -996,17 +996,19 @@ configurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - # Add --disable-dependency-tracking to speed up some builds. - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" + if [ -f "$configureScript" ]; then + # Add --disable-dependency-tracking to speed up some builds. + if [ -z "${dontAddDisableDepTrack:-}" ]; then + if grep -q dependency-tracking "$configureScript"; then + configureFlags="--disable-dependency-tracking $configureFlags" + fi fi - fi - # By default, disable static builds. - if [ -z "${dontDisableStatic:-}" ]; then - if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" + # By default, disable static builds. + if [ -z "${dontDisableStatic:-}" ]; then + if grep -q enable-static "$configureScript"; then + configureFlags="--disable-static $configureFlags" + fi fi fi