Messages in this thread |  | | Date | Mon, 04 Nov 2013 21:59:40 -0700 | From | David Ahern <> | Subject | Re: [PATCH 1/2] tools/perf/build: Fix detection of non-core features |
| |
ping. did not see this one in your last push to Ingo.
On 10/29/13, 10:43 AM, David Ahern wrote: > feature_check needs to be invoked through call, and LDFLAGS may not be set > so quotes are needed. > > Thanks to Jiri for spotting the quotes around LDFLAGS; that one was driving > me nuts with the upcoming timerfd feature detection. > > Signed-off-by: David Ahern <dsahern@gmail.com> > Cc: Ingo Molnar <mingo@kernel.org> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Jiri Olsa <jolsa@redhat.com> > --- > tools/perf/config/Makefile | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile > index 543aa953bab1..c82772207e6e 100644 > --- a/tools/perf/config/Makefile > +++ b/tools/perf/config/Makefile > @@ -96,7 +96,7 @@ endif > > feature_check = $(eval $(feature_check_code)) > define feature_check_code > - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -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)) > @@ -233,7 +233,7 @@ CFLAGS += -I$(LIB_INCLUDE) > CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE > > ifndef NO_BIONIC > - $(feature_check,bionic) > + $(call feature_check,bionic) > ifeq ($(feature-bionic), 1) > BIONIC := 1 > EXTLIBS := $(filter-out -lrt,$(EXTLIBS)) > @@ -470,15 +470,15 @@ else > CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT > else > ifneq ($(feature-libbfd), 1) > - $(feature_check,liberty) > + $(call feature_check,liberty) > ifeq ($(feature-liberty), 1) > EXTLIBS += -lbfd -liberty > else > - $(feature_check,liberty-z) > + $(call feature_check,liberty-z) > ifeq ($(feature-liberty-z), 1) > EXTLIBS += -lbfd -liberty -lz > else > - $(feature_check,cplus-demangle) > + $(call feature_check,cplus-demangle) > ifeq ($(feature-cplus-demangle), 1) > EXTLIBS += -liberty > CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT >
|  |