diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-17 04:08:38 +0200 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-21 18:56:09 +0200 |
| commit | 214377e9b7e3185abf5998b8a90450e01bab21a7 (patch) | |
| tree | 569ef74989332cbb2decad0b4673d69088e7bae7 /samples | |
| parent | Revert "Makefile: install modules.builtin even if CONFIG_MODULES=n" (diff) | |
| download | linux-214377e9b7e3185abf5998b8a90450e01bab21a7.tar.xz linux-214377e9b7e3185abf5998b8a90450e01bab21a7.zip | |
samples: watch_queue: build sample program for target architecture
This userspace program includes UAPI headers exported to usr/include/.
'make headers' always works for the target architecture (i.e. the same
architecture as the kernel), so the sample program should be built for
the target as well. Kbuild now supports 'userprogs' for that.
I also guarded the CONFIG option by 'depends on CC_CAN_LINK' because
$(CC) may not provide libc.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 2 | ||||
| -rw-r--r-- | samples/watch_queue/Makefile | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index f3ac549a53b0..0ed6e4d71d87 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -211,7 +211,7 @@ config SAMPLE_WATCHDOG config SAMPLE_WATCH_QUEUE bool "Build example /dev/watch_queue notification consumer" - depends on HEADERS_INSTALL + depends on CC_CAN_LINK && HEADERS_INSTALL help Build example userspace program to use the new mount_notify(), sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function. diff --git a/samples/watch_queue/Makefile b/samples/watch_queue/Makefile index 8511fb6c53d2..792b22f593cf 100644 --- a/samples/watch_queue/Makefile +++ b/samples/watch_queue/Makefile @@ -1,7 +1,5 @@ -# List of programs to build -hostprogs := watch_test +# SPDX-License-Identifier: GPL-2.0-only +userprogs := watch_test +always-y := $(userprogs) -# Tell kbuild to always build the programs -always-y := $(hostprogs) - -HOSTCFLAGS_watch_test.o += -I$(objtree)/usr/include +userccflags += -I usr/include |