Changeset 3344 in kBuild

Timestamp:

May 20, 2020 4:43:48 PM (5 years ago)

Author:

bird

Message:

header.kmk,footer-pass2-compiling-targets.kmk: Introducing KMK_WITH_QUOTING as a simple 'quote' feature indicator. The SOURCES must be handled as a list of quoted files, or we cannot add chkstk.obj and such from an VC++ installation.

Location:

trunk/kBuild

Files:

• footer-pass2-compiling-targets.kmk (modified) (4 diffs)
• header.kmk (modified) (1 diff)

trunk/kBuild/footer-pass2-compiling-targets.kmk

@@ -298 +298 @@
 endef
 
+ifdef KMK_WITH_QUOTING
+define def_src_handler_obj
+ifeq ($(defpath),)
+ $(target)_2_OBJS += $(source)
+else
+ $(target)_2_OBJS += $(qabspathex ,$(source), $(defpath))
+endif
+endef
+else
 define def_src_handler_obj
 ifeq ($(defpath),)
@@ -305 +314 @@
 endif
 endef
+endif
 ## @}
 
@@ -325 +335 @@
 # @param    much-more...
 # @returns  othersrc, $(target)_2_OBJS, ++
+ifdef KMK_WITH_QUOTING
+define def_target_sources
+local target_src_handlers := $($(target)_SRC_HANDLERS) $(KBUILD_SRC_HANDLERS)
+$(foreachfile source,\
+        $($(target)_SOURCES)\
+        $($(target)_SOURCES.$(bld_trg))\
+        $($(target)_SOURCES.$(bld_trg).$(bld_type))\
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch).$(bld_type))\
+        $($(target)_SOURCES.$(bld_trg_arch))\
+        $($(target)_SOURCES.$(bld_trg_cpu))\
+        $($(target)_SOURCES.$(bld_type))\
+        ,$(evalvalctx def_src_handler_one) )
+
+$(foreachfile source,\
+        $($(target)_GEN_SOURCES_)\
+        $($(target)_GEN_SOURCES_.$(bld_trg))\
+        $($(target)_GEN_SOURCES_.$(bld_trg).$(bld_type))\
+        $($(target)_GEN_SOURCES_.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_GEN_SOURCES_.$(bld_trg).$(bld_trg_arch).$(bld_type))\
+        $($(target)_GEN_SOURCES_.$(bld_trg_arch))\
+        $($(target)_GEN_SOURCES_.$(bld_trg_cpu))\
+        $($(target)_GEN_SOURCES_.$(bld_type))\
+        ,$(evalvalctx def_src_handler_one) )
+endef # def_target_sources
+else
 define def_target_sources
 local target_src_handlers := $($(target)_SRC_HANDLERS) $(KBUILD_SRC_HANDLERS)
@@ -349 +385 @@
         ,$(evalvalctx def_src_handler_one) )
 endef # def_target_sources
+endif
 $(eval-opt-var def_target_sources)
 

trunk/kBuild/header.kmk

@@ -408 +408 @@
 # Paths and stuff.
 #
+
+## Cache this query.
+if1of (quote,$(KMK_FEATURES))
+ KMK_WITH_QUOTING := 1
+endif
 
 # Adjust DEPTH first.