diff options
author | 张忠山 <zzs213@126.com> | 2012-12-04 09:30:47 +0800 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-08 12:18:53 +0100 |
commit | 6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 (patch) | |
tree | c17d748ae80c198d7c7eaff4aa930677ea4983f8 | |
parent | e7509bfbabc46e15e66193efac64440b48e5e88f (diff) | |
download | barebox-6d7dcfbccfa2a42b16eb7529a3785fdac25c8705.tar.gz barebox-6d7dcfbccfa2a42b16eb7529a3785fdac25c8705.tar.xz |
let kbuild build foo/bar.o correctly
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: 张忠山 <zzs213@126.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | scripts/Makefile.lib | 8 |
1 files 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 |