[PATCH RESEND] tools/build: drop slang include path in test-all

[PATCH RESEND] tools/build: drop slang include path in test-all

[John Keeping]

Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
/usr/include/slang/") added a proper test to check whether slang.h is in
a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
host include path for libslang") removed the include path for
test-libslang.bin but missed test-all.bin.  Apply the same change to
test-all.bin.

Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
Signed-off-by: John Keeping <john@metanate.com>
---
Resending as linux-perf-users wasn't included last time.
MAINTAINERS doesn't include any entries covering this file.

 tools/build/feature/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index d024b5204ba0..71390309f4d7 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -91,7 +91,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(
 ###############################
 
 $(OUTPUT)test-all.bin:
-	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
+	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
 
 $(OUTPUT)test-hello.bin:
 	$(BUILD)
-- 
2.33.1

Re: [PATCH RESEND] tools/build: drop slang include path in test-all

[Florian Fainelli]

On 10/25/21 10:23 AM, John Keeping wrote:
> Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
> /usr/include/slang/") added a proper test to check whether slang.h is in
> a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
> host include path for libslang") removed the include path for
> test-libslang.bin but missed test-all.bin.  Apply the same change to
> test-all.bin.
> 
> Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
> Signed-off-by: John Keeping <john@metanate.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH RESEND] tools/build: drop slang include path in test-all

[Arnaldo Carvalho de Melo]

Em Mon, Oct 25, 2021 at 10:45:17AM -0700, Florian Fainelli escreveu:
> On 10/25/21 10:23 AM, John Keeping wrote:
> > Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
> > /usr/include/slang/") added a proper test to check whether slang.h is in
> > a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
> > host include path for libslang") removed the include path for
> > test-libslang.bin but missed test-all.bin.  Apply the same change to
> > test-all.bin.
> > 
> > Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
> > Signed-off-by: John Keeping <john@metanate.com>
> 
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks, applied.

- Arnaldo