diff options
| author | Daniel Hahler <git@thequod.de> | 2019-09-02 11:13:56 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-09-06 08:47:55 +0200 |
| commit | 597acaab4fabe6bc277bdf01d118d8be88e825b5 (patch) | |
| tree | d2b64d39a982411dfba5c5e8b22eb818f8aa3ec1 | |
| parent | 2829e32e3cc894bdd4fffced1cfd78a72dbff763 (diff) | |
| download | zsh-597acaab4fabe6bc277bdf01d118d8be88e825b5.tar.gz zsh-597acaab4fabe6bc277bdf01d118d8be88e825b5.tar.xz zsh-597acaab4fabe6bc277bdf01d118d8be88e825b5.zip | |
44722: _make: use --always-make instead of .PHONY for GNU make
Using ".PHONY" might actually execute (phony) targets then, while "--always-make" triggers processing of all targets, respecting `-n` (`--dry-run`). (This can be seen with `make -nsp .PHONY` in https://github.com/neomake/neomake/tree/76b110d49a, where it actually causes infinite processing then) ".PHONY" was used since the beginning here (37012f06a [1]). As for bmake (which also uses `.PHONY`): there does not appear to be a similar option for it. While it might work better there (i.e. not causing targets to be run), it causes an error at least when testing it quickly - which indicates that it behaves as if using any other non-existing (or special) target there maybe: > bmake: don't know how to make .PHONY. Stop This was added in ecc0a5ece [2] (workers-39654). Since it uses `-s -f "$file" -V.ALLTARGETS` with `bmake` before to get targets explicitly, there might not be a reason for calling `bmake` with `-nsdg1Fstdout … .PHONY` additionally in the first place?! 1: https://github.com/danielshahaf/zsh/commit/37012f06a 2: https://github.com/danielshahaf/zsh/commit/ecc0a5ece
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_make | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 234120191..dabbaeb2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-09-06 Daniel Hahler <zsh@thequod.de> + + * 44722: Completion/Unix/Command/_make: use --always-make + instead of .PHONY for GNU make. + 2019-09-04 Daniel Shahaf <d.s@daniel.shahaf.name> * 44726/0002: Completion/Unix/Command/_subversion: Update diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index e23906373..56d47f4ea 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -262,7 +262,7 @@ _make() { if [[ $is_gnu == gnu ]] then if zstyle -t ":completion:${curcontext}:targets" call-command; then - _make-parseMakefile < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null) + _make-parseMakefile < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" --always-make 2> /dev/null) else _make-parseMakefile < $file fi |