From 6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 Mon Sep 17 00:00:00 2001 From: 张忠山 Date: Tue, 4 Dec 2012 09:30:47 +0800 Subject: let kbuild build foo/bar.o correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When obj-y has foo/bar.o, kbuild can't generate foo/bar.o according foo/bar.c. Fix this this patch based on linux kernel commit 521cb40b0c44418a4fd36dc633f575813d59a43d Signed-off-by: 张忠山 Signed-off-by: Sascha Hauer --- scripts/Makefile.lib | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index cb46db225e..14e471d17c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -55,10 +55,10 @@ multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y))) multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y))) multi-objs := $(multi-objs-y) $(multi-objs-m) -# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live -# in the local directory -__subdir-obj-y := $(foreach o,$(pbl-y),$(if $(filter-out $(o),$(notdir $(o))),$(o))) -subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o))) +# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to +# tell kbuild to descend +__subdir-obj-y := $(filter %/built-in-pbl.o, $(pbl-y)) +subdir-obj-y := $(filter %/built-in.o, $(obj-y)) subdir-obj-y += $(__subdir-obj-y) # $(obj-dirs) is a list of directories that contain object files -- cgit v1.2.3