Messages in this thread | | | Date | Mon, 14 Dec 2015 11:08:51 +0100 | From | Jiri Olsa <> | Subject | Re: [PATCH v3 02/17] tools build: Fix feature Makefile dependencies for 'O=' |
| |
On Sun, Dec 13, 2015 at 10:18:02PM -0600, Josh Poimboeuf wrote: > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> > --- > tools/build/Makefile.feature | 2 +- > tools/build/feature/Makefile | 95 ++++++++++++++++++++++---------------------- > 2 files changed, 49 insertions(+), 48 deletions(-) > > diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature > index b8c31ec..6c0519d 100644 > --- a/tools/build/Makefile.feature > +++ b/tools/build/Makefile.feature > @@ -7,7 +7,7 @@ endif > > feature_check = $(eval $(feature_check_code)) > define feature_check_code > - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) > + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) > endef > > feature_set = $(eval $(feature_set_code)) > diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile > index cea04ce9..8fec49d 100644 > --- a/tools/build/feature/Makefile > +++ b/tools/build/feature/Makefile > @@ -1,4 +1,3 @@ > - > FILES= \ > test-all.bin \ > test-backtrace.bin \ > @@ -38,38 +37,40 @@ FILES= \ > test-bpf.bin \ > test-get_cpuid.bin > > +OUTPUT_FILES = $(addprefix $(OUTPUT),$(FILES))
seems there's no need to introduce new variable, you could use FILES:
FILES := $(addprefix $(OUTPUT),$(FILES))
jirka
| |