Changeset 1690 for trunk/kBuild/tools


Ignore:
Timestamp:
Aug 31, 2008, 4:29:01 PM (17 years ago)
Author:
bird
Message:

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.

Location:
trunk/kBuild/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC70.kmk

    r1547 r1690  
    295295# @param    $(outbase)  Output basename (full). Use this for list files and such.
    296296TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    297 TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk
     297TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    298298TOOL_VCC70_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    299299TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    … …  
    310310                $(subst /,\\,$(objs)) \
    311311                $(subst /,\\,$(libs))
    312 ifeq ($(filter %.exp .def,$(othersrc)),)
    313312        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    314 endif
    315313$(eval _DIRS += $(PATH_LIB))
    316314endef

  • trunk/kBuild/tools/VCC80.kmk

    r1547 r1690  
    290290TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    291291TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    292 TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
     292TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    293293define TOOL_VCC80_LINK_DLL_CMDS
    294294        $(QUIET)$(TOOL_VCC80_LD) $(flags) \
    … …  
    305305        $(QUIET)$(TEST) -f $(out).manifest -- \
    306306                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    307 ifeq ($(filter %.exp .def,$(othersrc)),)
    308307        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    309 endif
    310308$(eval _DIRS += $(PATH_LIB))
    311309endef

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r1547 r1690  
    267267TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    268268TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    269 TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
     269TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    270270define TOOL_VCC80AMD64_LINK_DLL_CMDS
    271271        $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
    … …  
    282282        $(QUIET)$(TEST) -f $(out).manifest -- \
    283283                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    284 ifeq ($(filter %.exp .def,$(othersrc)),)
    285284        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    286 endif
    287285$(eval _DIRS += $(PATH_LIB))
    288286endef

  • trunk/kBuild/tools/VCC80X86.kmk

    r1547 r1690  
    267267TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    268268TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    269 TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    270 TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
     269TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp 
     270TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    271271define TOOL_VCC80X86_LINK_DLL_CMDS
    272272        $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
    … …  
    283283        $(QUIET)$(TEST) -f $(out).manifest -- \
    284284                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    285 ifeq ($(filter %.exp .def,$(othersrc)),)
    286285        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    287 endif
    288286$(eval _DIRS += $(PATH_LIB))
    289287endef
Note: See TracChangeset for help on using the changeset viewer.