diff mbox series

[RESEND] selftests/futex: fix build for clang

Message ID 20221010063702.1323118-1-ricardo.canuelo@collabora.com (mailing list archive)
State Accepted
Headers show
Series [RESEND] selftests/futex: fix build for clang | expand

Commit Message

Ricardo Cañuelo Oct. 10, 2022, 6:37 a.m. UTC
Don't use the test-specific header files as source files to force a
target dependency, as clang will complain if more than one source file
is used for a compile command with a single '-o' flag.

Use the proper Makefile variables instead as defined in
tools/testing/selftests/lib.mk.

Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
---
 tools/testing/selftests/futex/functional/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Shuah Khan Oct. 10, 2022, 5:05 p.m. UTC | #1
On 10/10/22 00:37, Ricardo Cañuelo wrote:
> Don't use the test-specific header files as source files to force a
> target dependency, as clang will complain if more than one source file
> is used for a compile command with a single '-o' flag.
> 
> Use the proper Makefile variables instead as defined in
> tools/testing/selftests/lib.mk.
> 
> Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
> ---

I will apply this and other two patches right after the merge window for
rc2.

thanks,
-- Shuah
André Almeida Oct. 14, 2022, 4:50 p.m. UTC | #2
On 10/10/22 03:37, Ricardo Cañuelo wrote:
> Don't use the test-specific header files as source files to force a
> target dependency, as clang will complain if more than one source file
> is used for a compile command with a single '-o' flag.
> 
> Use the proper Makefile variables instead as defined in
> tools/testing/selftests/lib.mk.
> 
> Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
> ---

Reviewed-by: André Almeida <andrealmeid@igalia.com>

Thanks for the patch!
diff mbox series

Patch

diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index 732149011692..5a0e0df8de9b 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -3,11 +3,11 @@  INCLUDES := -I../include -I../../ -I../../../../../usr/include/
 CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES)
 LDLIBS := -lpthread -lrt
 
-HEADERS := \
+LOCAL_HDRS := \
 	../include/futextest.h \
 	../include/atomic.h \
 	../include/logging.h
-TEST_GEN_FILES := \
+TEST_GEN_PROGS := \
 	futex_wait_timeout \
 	futex_wait_wouldblock \
 	futex_requeue_pi \
@@ -24,5 +24,3 @@  TEST_PROGS := run.sh
 top_srcdir = ../../../../..
 DEFAULT_INSTALL_HDR_PATH := 1
 include ../../lib.mk
-
-$(TEST_GEN_FILES): $(HEADERS)