Changeset 21772

Timestamp:

Oct 31, 2011, 9:36:48 PM (14 years ago)

Author:

dmik

Message:

Fix debug+release .def mode of the import library made with ImpDef tool.

File:

• branches/gcc-kmk/Config.kmk (modified) (2 diffs)

branches/gcc-kmk/Config.kmk

@@ -22 +22 @@
 ifneq ($(3),)
     local def_debug := $(3)
-        local def_exp_debug := $$$$($(1)_imp_0_OUTDIR)/$(basename $(def_debug)).exp.def
+        local def_exp_debug := $(basename $(def_debug)).exp.def
 endif
     $(eval $(def_odin_implib))
@@ -31 +31 @@
     $(target)_imp_TEMPLATE = OdinCxx
     $(target)_imp_NAME     = $(target)
+    $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) | $$$$(dir $$$$@)
+                %$$(call MSG_TOOL,impdef,$(target)_imp,$(abspath $$<),$$@)
+                $(QUIET2)$$(PATH_STAGE_BIN)/impdef $$< $$@
 ifeq ($(def_exp_debug),)
     $(target)_imp_SOURCES  = $$($(target)_imp_0_OUTDIR)/$(def_exp)
-    $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) | $$$$(dir $$$$@)
-                $$(PATH_STAGE_BIN)/impdef $$< $$@
     $(target)_imp_CLEAN   += $$($(target)_imp_0_OUTDIR)/$(def_exp)
 else
-    $(target)_imp_SOURCES.release  = $(def_exp)
-    $(def_exp): $(def) | $$$$(dir $$$$@)
-                $$(PATH_STAGE_BIN)/impdef $$< $$@
-    $(target)_imp_CLEAN   += $(def_exp)
-    $(target)_imp_SOURCES.debug   = $(def_exp_debug)
-    $(def_exp_debug): $(def_debug) | $$$$(dir $$$$@)
-                $$(PATH_STAGE_BIN)/impdef $$< $$@
-    $(target)_imp_CLEAN   += $(def_exp_debug)
+    $(target)_imp_SOURCES.release  = $$($(target)_imp_0_OUTDIR)/$(def_exp)
+    $(target)_imp_CLEAN.release   += $$($(target)_imp_0_OUTDIR)/$(def_exp)
+    $$$$($(target)_imp_0_OUTDIR)/$(def_exp_debug): $(def_debug) | $$$$(dir $$$$@)
+                %$$(call MSG_TOOL,impdef,$(target)_imp,$(abspath $$<),$$@)
+                $(QUIET2)$$(PATH_STAGE_BIN)/impdef $$< $$@
+    $(target)_imp_SOURCES.debug    = $$($(target)_imp_0_OUTDIR)/$(def_exp_debug)
+    $(target)_imp_CLEAN.debug     += $$($(target)_imp_0_OUTDIR)/$(def_exp_debug)
 endif
 endef