Changeset 1434 in kBuild

Timestamp:

Mar 25, 2008 12:43:55 AM (17 years ago)

Author:

bird

Message:

don't apply defpath to the source before we've collected the flags. (recent regression)

File:

• trunk/kBuild/footer.kmk (modified) (4 diffs)

trunk/kBuild/footer.kmk

@@ -1983 +1983 @@
 
 define def_src_handler_obj
-$(target)_OBJS_ += $(source)
+ifeq ($(defpath),)
+ $(target)_OBJS_ += $(source)
+else
+ $(target)_OBJS_ += $(abspathex $(source), $(defpath))
+endif
 endef
 ## @}
@@ -1995 +1999 @@
 #$ (warning def_src_handler_one: source=$(source) suff=$(suff) src_handler=$(src_handler) handler=$(handler))
 ifneq ($(handler),)
-$(eval $(value $(handler)))
+ $(eval $(value $(handler)))
 else
-othersrc += $(source)
+ othersrc += $(source)
 endif
 endef
@@ -2007 +2011 @@
 # @returns      othersrc, $(target)_OBJS_, ++
 define def_target_sources
-
 target_src_handlers := $($(target)_SRC_HANDLERS) $(KBUILD_SRC_HANDLERS)
-ifeq ($(defpath),)
 $(foreach source,\
         $($(target)_SOURCES)\
@@ -2018 +2020 @@
         $($(target)_SOURCES.$(bld_type))\
         ,$(eval $(value def_src_handler_one)) )
-else
-$(foreach source,\
-        $(abspathex $($(target)_SOURCES)\
-                $($(target)_SOURCES.$(bld_trg))\
-                $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch))\
-                $($(target)_SOURCES.$(bld_trg_arch))\
-                $($(target)_SOURCES.$(bld_trg_cpu))\
-                $($(target)_SOURCES.$(bld_type))\
-                ,$(defpath))\
-        ,$(eval $(value def_src_handler_one)) )
-endif
-
 endef