kunit: Fix 'hooks.o' build by recursing into kunit
authorDavid Gow <davidgow@google.com>
Sat, 25 Feb 2023 01:45:30 +0000 (09:45 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2023 22:49:03 +0000 (14:49 -0800)
commit32ff6831cdecd828bd8be9cdfb6c4a3d1feb8f8a
tree1483d3a05681fdfebe1abd2ec1327111e7ef1003
parent5ca26d6039a6b42341f7f5cc8d10d30ca1561a7b
kunit: Fix 'hooks.o' build by recursing into kunit

KUnit's 'hooks.o' file need to be built-in whenever KUnit is enabled
(even if CONFIG_KUNIT=m).  We'd previously attemtped to do this by
adding 'kunit/hooks.o' to obj-y in lib/Makefile, but this caused hooks.c
to be rebuilt even when it was unchanged.

Instead, always recurse into lib/kunit using obj-y when KUnit is
enabled, and add the hooks there.

Fixes: 7170b7ed6acb ("kunit: Add "hooks" to call into KUnit when it's built as a module").
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/linux-kselftest/CAHk-=wiEf7irTKwPJ0jTMOF3CS-13UXmF6Fns3wuWpOZ_wGyZQ@mail.gmail.com/
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
lib/Makefile
lib/kunit/Makefile