Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4acf6c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

tools/perf/build: Pass through LDFLAGS to feature tests 



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: default avatarDavid Ahern <dsahern@gmail.com>
Tested-by: default avatarDavid 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>
Link: http://lkml.kernel.org/r/20131007155129.GA1066@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 20c99e82

tools/perf/config/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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))
@@ -173,7 +173,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

tools/perf/config/feature-checks/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ CC := $(CC) -MD 


all: $(FILES)



BUILD = $(CC) -o $(OUTPUT)$@ $@.c

BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c



###############################