topjohnwu/ndk-busybox
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-busybox.git synced 2024-12-04 18:06:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kill: need not build kill.c when ash's job control is off

Browse Source 
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>
This commit is contained in:
Kang-Che Sung 2017-01-09 17:02:51 +01:00 committed by Denys Vlasenko
parent e7b54d0fcc
commit 53487a8d22
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
procps/Kbuild.src
View File

@ -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

3
procps/kill.c
View File

@ -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)