VirtualBox

Changeset 2487 in kBuild


Ignore:
Timestamp:
Jul 21, 2011 8:01:27 PM (14 years ago)
Author:
bird
Message:

tools\*.kmk: PATH_LIB -> PATH_STAGE_LIB; VCC 10.0 hacking.

Location:
trunk/kBuild/tools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/MINGW32.kmk

    r2413 r2487  
    254254# @param    $(outbase)  Output basename (full). Use this for list files and such.
    255255TOOL_MINGW32_LINK_DLL_OUTPUT =
    256 TOOL_MINGW32_LINK_DLL_OUTPUT_MAYBE = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
     256TOOL_MINGW32_LINK_DLL_OUTPUT_MAYBE = $(outbase).a $(outbase).exp $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp $(PATH_STAGE_LIB)/$(notdir $(outbase)).a
    257257## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, etc).
    258258TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    259259        $(filter %.def %.res,$(othersrc))
    260 TOOL_MINGW32_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     260TOOL_MINGW32_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    261261define TOOL_MINGW32_LINK_DLL_CMDS
    262262        $(QUIET)$(TOOL_MINGW32_DLLWRAP) $(flags)\
    … …  
    269269                $(foreach p,$(libpath), -L$(p))\
    270270                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
    271         $(QUIET)$(CP) $(outbase).exp $(outbase).a $(PATH_LIB)/
     271        $(QUIET)$(CP) $(outbase).exp $(outbase).a $(PATH_STAGE_LIB)/
    272272endef
    273273## @todo separate install stuff!

  • trunk/kBuild/tools/VCC100.kmk

    r2413 r2487  
    287287# @param    $(outbase)  Output basename (full). Use this for list files and such.
    288288TOOL_VCC100_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    289 TOOL_VCC100_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     289TOOL_VCC100_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    290290TOOL_VCC100_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    291 TOOL_VCC100_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     291TOOL_VCC100_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    292292define TOOL_VCC100_LINK_DLL_CMDS
    293293        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
    … …  
    304304        $(QUIET)$(TEST) -f $(out).manifest -- \
    305305                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    306         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    307 $(eval _DIRS += $(PATH_LIB))
     306        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     307$(eval _DIRS += $(PATH_STAGE_LIB))
    308308endef
    309309

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2413 r2487  
    154154TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
    155155TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
     156ifdef KBUILD_USE_KOBJCACHE
     157TOOL_VCC100AMD64_COMPILE_CXX_USES_KOBJCACHE = 1
     158TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).ii
     159TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
     160if 1
     161define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     162        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     163                --named-pipe-compile $(subst /,\\,//./pipe/kObjCache/$(translate $(outbase),:,_)/$(notdir $(source)))\
     164                --kObjCache-cpp $(outbase).ii\
     165                $(TOOL_VCC100AMD64_CXX) -E\
     166                $(flags)\
     167                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     168                $(subst /,\\,$(abspath $(source))) \
     169                --kObjCache-cc $(obj)\
     170                windbg $(TOOL_VCC100AMD64_CXX) -c -TP\
     171                $(flags)\
     172                -Fd$(outbase)-obj.pdb \
     173                -FD\
     174                -Fo$(obj)\
     175                $(subst /,\\,//./pipe/kObjCache/$(translate $(outbase),:,_)/$(notdir $(source)))
     176        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
     177endef
     178else
     179define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     180        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
     181                --kObjCache-cpp $(outbase).ii\
     182                $(TOOL_VCC100AMD64_CXX) -E\
     183                $(flags)\
     184                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     185                $(subst /,\\,$(abspath $(source))) \
     186                --kObjCache-cc $(obj)\
     187                $(TOOL_VCC100AMD64_CXX) -c -TP\
     188                $(flags)\
     189                -Fd$(outbase)-obj.pdb \
     190                -FD\
     191                -Fo$(obj)\
     192                $(outbase).ii
     193        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
     194endef
     195endif
     196else  # !KBUILD_USE_KOBJCACHE
    156197TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
    157198TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    … …  
    165206        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    166207endef
    167 
     208endif # !KBUILD_USE_KOBJCACHE
    168209
    169210## Compile resource source.
    … …  
    264305# @param    $(outbase)  Output basename (full). Use this for list files and such.
    265306TOOL_VCC100AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    266 TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     307TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    267308TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    268 TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     309TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    269310define TOOL_VCC100AMD64_LINK_DLL_CMDS
    270311        $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
    … …  
    281322        $(QUIET)$(TEST) -f $(out).manifest -- \
    282323                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    283         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    284 $(eval _DIRS += $(PATH_LIB))
     324        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     325$(eval _DIRS += $(PATH_STAGE_LIB))
    285326endef
    286327

  • trunk/kBuild/tools/VCC100X86.kmk

    r2413 r2487  
    266266# @param    $(outbase)  Output basename (full). Use this for list files and such.
    267267TOOL_VCC100X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    268 TOOL_VCC100X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     268TOOL_VCC100X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    269269TOOL_VCC100X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    270 TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     270TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    271271define TOOL_VCC100X86_LINK_DLL_CMDS
    272272        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
    … …  
    283283        $(QUIET)$(TEST) -f $(out).manifest -- \
    284284                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    285         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    286 $(eval _DIRS += $(PATH_LIB))
     285        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     286$(eval _DIRS += $(PATH_STAGE_LIB))
    287287endef
    288288

  • trunk/kBuild/tools/VCC70.kmk

    r2413 r2487  
    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 $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     297TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    298298TOOL_VCC70_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    299 TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     299TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    300300define TOOL_VCC70_LINK_DLL_CMDS
    301301        $(QUIET)$(TOOL_VCC70_LD) $(flags) \
    … …  
    310310                $(subst /,\\,$(objs)) \
    311311                $(subst /,\\,$(libs))
    312         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    313 $(eval _DIRS += $(PATH_LIB))
     312        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     313$(eval _DIRS += $(PATH_STAGE_LIB))
    314314endef
    315315

  • trunk/kBuild/tools/VCC80.kmk

    r2413 r2487  
    287287# @param    $(outbase)  Output basename (full). Use this for list files and such.
    288288TOOL_VCC80_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    289 TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     289TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    290290TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    291 TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     291TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    292292define TOOL_VCC80_LINK_DLL_CMDS
    293293        $(QUIET)$(TOOL_VCC80_LD) $(flags) \
    … …  
    304304        $(QUIET)$(TEST) -f $(out).manifest -- \
    305305                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    306         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    307 $(eval _DIRS += $(PATH_LIB))
     306        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     307$(eval _DIRS += $(PATH_STAGE_LIB))
    308308endef
    309309

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r2413 r2487  
    264264# @param    $(outbase)  Output basename (full). Use this for list files and such.
    265265TOOL_VCC80AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    266 TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     266TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    267267TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    268 TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     268TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    269269define TOOL_VCC80AMD64_LINK_DLL_CMDS
    270270        $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
    … …  
    281281        $(QUIET)$(TEST) -f $(out).manifest -- \
    282282                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    283         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    284 $(eval _DIRS += $(PATH_LIB))
     283        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     284$(eval _DIRS += $(PATH_STAGE_LIB))
    285285endef
    286286

  • trunk/kBuild/tools/VCC80X86.kmk

    r2413 r2487  
    266266# @param    $(outbase)  Output basename (full). Use this for list files and such.
    267267TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    268 TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     268TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    269269TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    270 TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     270TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_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         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    286 $(eval _DIRS += $(PATH_LIB))
     285        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
     286$(eval _DIRS += $(PATH_STAGE_LIB))
    287287endef
    288288
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette