[PATCH] tools/perf/build: Pass through LDFLAGS to feature tests

[Ingo Molnar <mingo@kernel.org>]

* David Ahern <dsahern@gmail.com> wrote:

> On 10/7/13 8:11 AM, Ingo Molnar wrote:
> >These changes are not yet committed into any stable Git tree - I've pushed
> >them out into:
> >
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tmp.perf
> >
> >(it might take a few minutes for kernel.org to sync up.)
> 
> Tested on Fedora 12, 14, 16 with varying degrees of feature support
> installed. The tests that failed are all static builds with the
> command line:
> 
> make O=/tmp/junk -C tools/perf LDFLAGS=-static NO_DWARF=1
> 
> Passing LDFLAGS to the feature tests should handle that.

Indeed. Does the patch below fix it for you?

Thanks,

	Ingo

-------------------->
Subject: tools/perf/build: Pass through LDFLAGS to feature tests
From: Ingo Molnar <mingo@kernel.org>
Date: Mon Oct 7 17:48:56 CEST 2013

David Ahern reported that when passing in LDFLAGS=-static then the
feature checks still succeed - causing build failures down the
line because the static libraries are missing.

Solve this by passing through LDFLAGS to the feature-check Makefile.

Reported-by: David Ahern <dsahern@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/perf/config/Makefile                |    4 ++--
 tools/perf/config/feature-checks/Makefile |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: tip/tools/perf/config/Makefile
===================================================================
--- tip.orig/tools/perf/config/Makefile
+++ tip/tools/perf/config/Makefile
@@ -95,7 +95,7 @@ endif
 
 feature_check = $(eval $(feature_check_code))
 define feature_check_code
-  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
+  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
 endef
 
 feature_set = $(eval $(feature_set_code))
@@ -172,7 +172,7 @@ ifeq ($(feature-all), 1)
   #
   $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_set,$(feat)))
 else
-  $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)
+  $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)
   $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_check,$(feat)))
 endif
 
Index: tip/tools/perf/config/feature-checks/Makefile
===================================================================
--- tip.orig/tools/perf/config/feature-checks/Makefile
+++ tip/tools/perf/config/feature-checks/Makefile
@@ -32,7 +32,7 @@ CC := $(CC) -MD
 
 all: $(FILES)
 
-BUILD = $(CC) -o $(OUTPUT)$@ $@.c
+BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
 
 ###############################