Changeset 3415 for trunk/kBuild/footer-pass2-compiling-targets.kmk

Timestamp:

Aug 21, 2020, 1:43:33 AM (5 years ago)

Author:

bird

Message:

kmk: Fixed mixup from r2433 where _TARGET_TOOL was extended but the builtin source handling functions wasn't. For instance, using _TOOLS, _TOOLS.amd64 and _TOOLS.x86, we would end up with the first when compiling and one of the latter two when linking. Also replaced a few legacy BUILD_PLATFORM* with KBUILD_HOST* variable names in the footers.

File:

• trunk/kBuild/footer-pass2-compiling-targets.kmk (modified) (3 diffs)

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

@@ -270 +270 @@
 define def_src_handler_c
 local type := C
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
 define def_src_handler_cxx
 local type := CXX
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
 define def_src_handler_objc
 local type := OBJC
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
 define def_src_handler_objcxx
 local type := OBJCXX
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
 define def_src_handler_asm
 local type := AS
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
 define def_src_handler_rc
 local type := RC
- $(kb-src-one 3)
+ $(kb-src-one 4)
 endef
 
@@ -774 +774 @@
 # basics
 local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
-local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(BUILD_$(bld_trg_base_var)))
-local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_$(bld_trg_base_var)_ARCH))
-local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_$(bld_trg_base_var)_CPU))
+local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(KBUILD_$(bld_trg_base_var)))
+local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(KBUILD_$(bld_trg_base_var)_ARCH))
+local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_$(bld_trg_base_var)_CPU))
 
 local tool        := $(call _TARGET_TOOL,$(target),LD)
@@ -1115 +1115 @@
 typevar := _BLDPROGS
 mode    := 0755
-bld_trg_base_var := PLATFORM
+bld_trg_base_var := HOST
 $(foreach target, $(_ALL_BLDPROGS), $(evalvalctx def_link_common))