Changeset 3285 for trunk

Timestamp:

Jan 5, 2019, 4:24:58 AM (7 years ago)

Author:

bird

Message:

footer-pass2-compiling-targets.kmk,*precomp.kmk: Fixed intermediate property regression and made the precompiler units use kb-src-one with v3 specified for better efficiency.

Location:

trunk/kBuild

Files:

• footer-pass2-compiling-targets.kmk (modified) (5 diffs)
• units/gccprecomp.kmk (modified) (2 diffs)
• units/vccprecomp.kmk (modified) (2 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (c) 2004-2017 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
+# Copyright (c) 2004-2019 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -558 +558 @@
 endif
 
+# Target level intermediates (before units!).
+local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
+        $(target)_INTERMEDIATES \
+        $(target)_INTERMEDIATES.$(bld_trg) \
+        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
+        $(target)_INTERMEDIATES.$(bld_type) \
+        ,$(if-expr defined($(var)),$$$$($(var)),))
+
 # Do units pre source callouts.
 local units       := \
@@ -567 +577 @@
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre_2))
-
-# target level intermediates
-local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
-        $(target)_INTERMEDIATES \
-        $(target)_INTERMEDIATES.$(bld_trg) \
-        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
-        $(target)_INTERMEDIATES.$(bld_type) \
-        ,$(if-expr defined($(var)),$$$$($(var)),))
 
 # source -> object
@@ -784 +784 @@
 endif
 
+# Target level intermediates (before units!).
+local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
+        $(target)_INTERMEDIATES \
+        $(target)_INTERMEDIATES.$(bld_trg) \
+        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
+        $(target)_INTERMEDIATES.$(bld_type) \
+        ,$(if-expr defined($(var)),$$$$($(var)),))
+
 # Do units pre source callouts.
 local units       := \
@@ -793 +803 @@
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre_2))
-
-# target level intermediates
-local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
-        $(target)_INTERMEDIATES \
-        $(target)_INTERMEDIATES.$(bld_trg) \
-        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
-        $(target)_INTERMEDIATES.$(bld_type) \
-        ,$(if-expr defined($(var)),$$$$($(var)),))
 
 # source -> object

trunk/kBuild/units/gccprecomp.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2016-2017 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
+# Copyright (c) 2016-2019 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -63 +63 @@
  local suff   := $(suffix $(source))
  local type   := PCH
- $(kb-src-one 2)
+ $(kb-src-one 3)
 endef
 

trunk/kBuild/units/vccprecomp.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2016-2017 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
+# Copyright (c) 2016-2019 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -62 +62 @@
  local suff   := $(suffix $(source))
  local type   := CXX
- $(kb-src-one 2)
+ $(kb-src-one 3)
 endef