diff options
| author | happysalada <raphael@megzari.com> | 2021-07-19 15:24:39 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-08-30 10:26:14 +0900 |
| commit | 13049cd33e5e3a9356e98b9c562717a66045cfe3 (patch) | |
| tree | e1dd141b66351219f7127d87f5e2216e40772076 /pkgs/stdenv | |
| parent | 2fa9facc49cd08870e01d1011cf5f8e9b931aed3 (diff) | |
| download | nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar.gz nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar.bz2 nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar.lz nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar.xz nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.tar.zst nixpkgs-13049cd33e5e3a9356e98b9c562717a66045cfe3.zip | |
stdenv: remove combined command 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 e90fc96ba50..9f3a126d39e 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1014,17 +1014,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 |