diff options
| author | Kang-Che Sung | 2017-01-09 17:02:51 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2017-01-09 17:02:51 +0100 |
| commit | 53487a8d221d9568b6d2ea81e729456b084dcdf9 (patch) | |
| tree | 9ef460794e05d256ab33630e380d36b18e57bc44 | |
| parent | e7b54d0fcce26fdbb0559728e317fb852c63e02b (diff) | |
| download | busybox-53487a8d221d9568b6d2ea81e729456b084dcdf9.zip busybox-53487a8d221d9568b6d2ea81e729456b084dcdf9.tar.gz | |
kill: need not build kill.c when ash's job control is off
ash kill builtin depends on the job control config option.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | procps/Kbuild.src | 5 | ||||
| -rw-r--r-- | procps/kill.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/procps/Kbuild.src b/procps/Kbuild.src index 82f37f0..dedef88 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src @@ -8,8 +8,5 @@ lib-y:= INSERT -lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash -lib-$(CONFIG_SH_IS_ASH) += kill.o # used for built-in kill by ash -lib-$(CONFIG_BASH_IS_ASH) += kill.o # used for built-in kill by ash - +lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o # used for built-in kill by ash lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush diff --git a/procps/kill.c b/procps/kill.c index 579c8e5..7c08225 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -285,8 +285,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv) /* Looks like they want to do a kill. Do that */ while (arg) { -#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \ - || ENABLE_HUSH_KILL +#if ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL /* * We need to support shell's "hack formats" of * " -PRGP_ID" (yes, with a leading space) |