samples: mei: 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>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/samples/Kconfig b/samples/Kconfig
index c68d391c0602c838e92d1d6554a702c9affbe0b8..69699db4967559f5dd1134a1c30de8319062ff44 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -193,6 +193,7 @@ config SAMPLE_VFS
 config SAMPLE_INTEL_MEI
        bool "Build example program working with intel mei driver"
        depends on INTEL_MEI
+       depends on CC_CAN_LINK && HEADERS_INSTALL
        help
          Build a sample program to work with mei device.
 

diff --git a/samples/mei/Makefile b/samples/mei/Makefile
index f5b9d02be2cd42fcb9928ee81ac030ed45d31090..329411f82369b9fae0798dabbf0285e72a20fb5b 100644 (file)
--- a/samples/mei/Makefile
+++ b/samples/mei/Makefile
@@ -1,10 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2012-2019, Intel Corporation. All rights reserved.
 
-hostprogs := mei-amt-version
+userprogs := mei-amt-version
+always-y := $(userprogs)
 
-HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include
-
-always-y := $(hostprogs)
-
-all: mei-amt-version
+userccflags += -I usr/include