Skip to contentSkip to conversation

samples: watch_queue: build sample program for target architecture

PATCH New Masahiro Yamada 1 participant 1 message Jun 17, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 samples/Kconfig              |  2 +-
 samples/watch_queue/Makefile | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)
samples/Kconfig +1 -1
index f3ac549a53b0..0ed6e4d71d87 100644
@@ -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.
samples/watch_queue/Makefile +4 -6
index 8511fb6c53d2..792b22f593cf 100644
@@ -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
Signature · 1 line
2.25.1