Skip to contentSkip to conversation

obj-dirs is calculated incorrectly if hostprogs-y is defined

PATCH New Pavel Roskin 1 participant 1 message Jun 2, 2006 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 obj-dirs is calculated incorrectly if hostprogs-y is defined

From: Pavel Roskin <[email protected]>

When Makefile.host is included, $(obj-dirs) is subjected to the addprefix operation for the second time. Prefix only needs to be added to the newly added directories, but not to those that came from Makefile.lib.

This causes the build system to create unneeded empty directories in the build tree when building in a separate directory. For instance, lib/lib/zlib_inflate is created in the build tree.

---

 scripts/Makefile.host |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
scripts/Makefile.host +5 -3
index 2d51970..2b066d1 100644
@@ -33,8 +33,8 @@ # Note: Shared libraries consisting of C
 __hostprogs := $(sort $(hostprogs-y)$(hostprogs-m))
 
 # hostprogs-y := tools/build may have been specified. Retreive directory
-obj-dirs += $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
-obj-dirs := $(strip $(sort $(filter-out ./,$(obj-dirs))))
+host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
+host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
 
 
 # C code
@@ -73,7 +73,9 @@ host-cxxmulti	:= $(addprefix $(obj)/,$(h
 host-cxxobjs	:= $(addprefix $(obj)/,$(host-cxxobjs))
 host-cshlib	:= $(addprefix $(obj)/,$(host-cshlib))
 host-cshobjs	:= $(addprefix $(obj)/,$(host-cshobjs))
-obj-dirs        := $(addprefix $(obj)/,$(obj-dirs))
+host-objdirs    := $(addprefix $(obj)/,$(host-objdirs))
+
+obj-dirs += $(host-objdirs)
 
 #####
 # Handle options to gcc. Support building with separate output directory