diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-15 00:00:01 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-25 19:53:24 +0000 |
| commit | ad98c36f1b1b681db433a6cb798e7ec21e8da33c (patch) | |
| tree | 117e279673d5e7bf5bbe900cb3b52314a0e5bfa6 /pkgs/stdenv/generic/setup.sh | |
| parent | 7438083a4d9d7b60b915d59e118f19398f177fe3 (diff) | |
| download | nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar.gz nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar.bz2 nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar.lz nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar.xz nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.tar.zst nixlib-ad98c36f1b1b681db433a6cb798e7ec21e8da33c.zip | |
stdenv: generic/setup.sh: simplify buildPhase Makefile check
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d7a4781448ae..17aaa5b798ff 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -968,7 +968,7 @@ buildPhase() { # set to empty if unset : ${makeFlags=} - if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 |