diff options
| author | Björn Töpel | 2023-10-04 14:48:37 +0200 |
|---|---|---|
| committer | Shuah Khan | 2023-10-05 14:23:21 -0600 |
| commit | 37013b557b7f39e603b4459ef82dc8b848f98a67 (patch) | |
| tree | 1d344f2a714078b21aeb742e9858091f7fd492a5 /Makefile | |
| parent | 6d3d638d1865a6e34787c6e20eee1c6d8d32fd40 (diff) | |
kbuild: Merge per-arch config for kselftest-merge target
Some kselftests has a per-arch config,
e.g. tools/testing/selftests/bpf/config.s390x.
Make sure these configs are picked up by the kselftest-merge target.
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1367,7 +1367,7 @@ kselftest-%: headers FORCE PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)find $(srctree)/tools/testing/selftests -name config | \ + $(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \ xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig |