diff options
| author | happysalada <raphael@megzari.com> | 2021-06-28 22:43:23 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-07-06 09:27:18 +0900 |
| commit | 06688b73ca661c0d7daa09355abc10c694164943 (patch) | |
| tree | a5286f228bbe80c89100cddabced1e17cf47c572 /pkgs/stdenv | |
| parent | ef76a5e009d3e7ff7a9f3788739d3dd331dd332f (diff) | |
| download | nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar.gz nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar.bz2 nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar.lz nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar.xz nixlib-06688b73ca661c0d7daa09355abc10c694164943.tar.zst nixlib-06688b73ca661c0d7daa09355abc10c694164943.zip | |
setup.sh: separate command from combined conditional
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index aa1e23f2666c..0db3a3f1254f 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 |