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

Timestamp:

Aug 2, 2011, 9:05:34 PM (14 years ago)

Author:

bird

Message:

footer-pass2-compiling-targets.kmk,G??4MACHO.kmk: debug info splitting fixes (mac related + generic).

File:

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

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

@@ -390 +390 @@
 # @param    debug_dir           The directory name.
 define def_link_install_debug_dir_rule
-local dir := $(debug_inst_path)/$(debug_inst)$(debug_dir)
+local dir := $(debug_inst_path)/$(debug_inst2)$(debug_dir)
 $$(call KB_FN_ASSERT_ABSPATH,dir)
 $$(dir): | $$$$(dir $$$$(patsubst %/,%,$$$$@))
@@ -402 +402 @@
 # @param    debug_file          Src=>Dst file pair.
 define def_link_install_debug_file_rule
-local dst := $(debug_inst_path)/$(debug_inst)$(word 2, $(subst =>,$(SP),$(debug_file)))
+local dst := $(debug_inst_path)/$(debug_inst2)$(word 2, $(subst =>,$(SP),$(debug_file)))
 $$(call KB_FN_ASSERT_ABSPATH,dst)
 local src := $(word 1, $(subst =>,$(SP),$(debug_file)))
 $$(call KB_FN_ASSERT_ABSPATH,src)
 $$(dst): $$(src) | $$$$(dir $$$$@)
-        %$$(call MSG_INST_FILE,$$@,$$<)
+        %$$(call MSG_INST_FILE,$$<,$$@)
         $$(QUIET)$(debug_install_cmd) $(if $(mode),-m $(mode)) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) -- $$< $$@
 $(target)_2_DEBUG_$(debug_var)_TARGET_FILES += $$(dst)
@@ -418 +418 @@
 if "$(substr $(debug_inst),-1,1)" == "/"
  if "$(debug_inst)" == "./"
-  local debug_inst :=
+  local debug_inst2 :=
+ else
+  local debug_inst2 := $(debug_inst)
  endif
  local debug_dirs  := $(patsubst $($(target)_0_OUTDIR)/%,%,$($(target)_2_OUTPUT_DEBUG_DIRS))
@@ -427 +429 @@
                         ,$($(target)_0_OUTDIR)/$(file)=>$(file))
 else
- local debug_files := $(call TOOL_$(tool)_$(tool_do)_DEBUG_INSTALL_FN,$(out),$(outbase),$(debug_inst))
+ local debug_notdir:= $(notdir $(debug_inst))
+ local debug_inst2 := $(dir $(debug_inst))
+ local debug_files := $(call TOOL_$(tool)_$(tool_do)_DEBUG_INSTALL_FN,$(out),$(outbase),$(debug_notdir))
  local debug_dirs  := $(filter     %/,$(debug_files))
  local debug_files := $(filter-out %/,$(debug_files))