Changeset 2551 in kBuild

Timestamp:

Nov 9, 2011 1:28:02 PM (13 years ago)

Author:

bird

Message:

footer: Allow INSTTYPE=none and DEBUG_INSTTYPE!=none.

Location:

trunk/kBuild

Files:

• footer-pass1.kmk (modified) (2 diffs)
• footer-pass2-compiling-targets.kmk (modified) (2 diffs)

trunk/kBuild/footer-pass1.kmk

@@ -181 +181 @@
 
 if1of ($(debug_insttype), stage both)
- ifn1of ($(insttype), stage both)
-  $(error kBuild: DEBUG_INSTTYPE=$(debug_insttype) and INSTTYPE=$(insttype) for target '$(target)' are not compatible)
- endif
  local debug_stage := $(firstdefined \
         $(target)_DEBUG_STAGE.$(bld_trg).$(bld_trg_arch).$(bld_type) \
@@ -214 +211 @@
 
 if1of ($(debug_insttype), both)
- ifn1of ($(insttype), both)
-  $(error kBuild: DEBUG_INSTTYPE=$(debug_insttype) and INSTTYPE=$(insttype) for target '$(target)' are not compatible)
- endif
  local debug_inst := $(firstdefined \
         $(target)_DEBUG_INST.$(bld_trg).$(bld_trg_arch).$(bld_type) \

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

@@ -348 +348 @@
 # @param        $(target_type_mode) The default file mode implied by the target type.
 define def_target_install_only
-ifneq ($($(target)_1_INSTTYPE),none)
+if1of ($($(target)_1_INSTTYPE) $($(target)_1_DEBUG_INSTTYPE), both stage)
+ # Determin common variables.
  local mode := $(firstword \
         $($(target)_MODE.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
@@ -376 +377 @@
  local pre_install_cmds  := $(evalcall def_fn_prop_get_first_defined,PRE_INST_CMDS)
  local post_install_cmds := $(evalcall def_fn_prop_get_first_defined,POST_INST_CMDS)
-
+endif
+
+ifneq ($($(target)_1_INSTTYPE),none)
  # Generate the rules
  ifeq ($($(target)_1_INSTTYPE),both)