diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /util-linux/setarch.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/setarch.c')
| -rw-r--r-- | util-linux/setarch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/setarch.c b/util-linux/setarch.c index d4b568832..520865318 100644 --- a/util-linux/setarch.c +++ b/util-linux/setarch.c | |||
| @@ -30,10 +30,10 @@ | |||
| 30 | //config: help | 30 | //config: help |
| 31 | //config: Alias to "setarch linux64". | 31 | //config: Alias to "setarch linux64". |
| 32 | 32 | ||
| 33 | //applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP)) | 33 | //applet:IF_SETARCH(APPLET_NOEXEC(setarch, setarch, BB_DIR_BIN, BB_SUID_DROP, setarch)) |
| 34 | // APPLET_ODDNAME:name main location suid_type help | 34 | // APPLET_NOEXEC:name main location suid_type help |
| 35 | //applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) | 35 | //applet:IF_LINUX32(APPLET_NOEXEC(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) |
| 36 | //applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) | 36 | //applet:IF_LINUX64(APPLET_NOEXEC(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) |
| 37 | 37 | ||
| 38 | //kbuild:lib-$(CONFIG_SETARCH) += setarch.o | 38 | //kbuild:lib-$(CONFIG_SETARCH) += setarch.o |
| 39 | //kbuild:lib-$(CONFIG_LINUX32) += setarch.o | 39 | //kbuild:lib-$(CONFIG_LINUX32) += setarch.o |