diff options
author | Kang-Che Sung <explorer09@gmail.com> | 2017-01-09 17:02:51 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-09 17:02:51 +0100 |
commit | 53487a8d221d9568b6d2ea81e729456b084dcdf9 (patch) | |
tree | 9ef460794e05d256ab33630e380d36b18e57bc44 | |
parent | e7b54d0fcce26fdbb0559728e317fb852c63e02b (diff) | |
download | busybox-w32-53487a8d221d9568b6d2ea81e729456b084dcdf9.tar.gz busybox-w32-53487a8d221d9568b6d2ea81e729456b084dcdf9.tar.bz2 busybox-w32-53487a8d221d9568b6d2ea81e729456b084dcdf9.zip |
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 82f37f0df..dedef8881 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src | |||
@@ -8,8 +8,5 @@ lib-y:= | |||
8 | 8 | ||
9 | INSERT | 9 | INSERT |
10 | 10 | ||
11 | lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash | 11 | lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o # used for built-in kill by ash |
12 | lib-$(CONFIG_SH_IS_ASH) += kill.o # used for built-in kill by ash | ||
13 | lib-$(CONFIG_BASH_IS_ASH) += kill.o # used for built-in kill by ash | ||
14 | |||
15 | lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush | 12 | lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush |
diff --git a/procps/kill.c b/procps/kill.c index 579c8e53c..7c0822542 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -285,8 +285,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv) | |||
285 | 285 | ||
286 | /* Looks like they want to do a kill. Do that */ | 286 | /* Looks like they want to do a kill. Do that */ |
287 | while (arg) { | 287 | while (arg) { |
288 | #if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \ | 288 | #if ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL |
289 | || ENABLE_HUSH_KILL | ||
290 | /* | 289 | /* |
291 | * We need to support shell's "hack formats" of | 290 | * We need to support shell's "hack formats" of |
292 | * " -PRGP_ID" (yes, with a leading space) | 291 | * " -PRGP_ID" (yes, with a leading space) |