儲存庫 kBuild 的更動 1690

時間撮記:

2008-8-31 下午02:29:01 (16 年 以前)

作者:

bird

訊息:

tools/VCC*: mention the .exp and .lib that we copy to PATH_LIB. The optional copying was broken and it is too late to say .def means no copy now.

位置:

trunk/kBuild/tools

檔案:

• VCC70.kmk (修改) (2 筆差異)
• VCC80.kmk (修改) (2 筆差異)
• VCC80AMD64.kmk (修改) (2 筆差異)
• VCC80X86.kmk (修改) (2 筆差異)

trunk/kBuild/tools/VCC70.kmk

@@ -295 +295 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk
+TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
 TOOL_VCC70_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
@@ -310 +310 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-ifeq ($(filter %.exp .def,$(othersrc)),)
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-endif
 $(eval _DIRS += $(PATH_LIB))
 endef

trunk/kBuild/tools/VCC80.kmk

@@ -290 +290 @@
 TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
 TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
+TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
 define TOOL_VCC80_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
@@ -305 +305 @@
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-ifeq ($(filter %.exp .def,$(othersrc)),)
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-endif
 $(eval _DIRS += $(PATH_LIB))
 endef

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -267 +267 @@
 TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
 TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
+TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
 define TOOL_VCC80AMD64_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
@@ -282 +282 @@
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-ifeq ($(filter %.exp .def,$(othersrc)),)
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-endif
 $(eval _DIRS += $(PATH_LIB))
 endef

trunk/kBuild/tools/VCC80X86.kmk

@@ -267 +267 @@
 TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
-TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
+TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp 
+TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
 define TOOL_VCC80X86_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
@@ -283 +283 @@
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-ifeq ($(filter %.exp .def,$(othersrc)),)
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-endif
 $(eval _DIRS += $(PATH_LIB))
 endef