VirtualBox

Changeset 3370 in kBuild


Ignore:
Timestamp:
Jun 10, 2020 10:45:05 AM (5 years ago)
Author:
bird
Message:

VCC142*: Must disable the scalable include cache when using kSubmit as the cache will go stale in kWorker. kWorker does its own more efficient caching (c1*.dll reads directories one file at a time).

Location:
trunk/kBuild/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC142.kmk

    r3342 r3370  
    122122TOOL_VCC142_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
    123123
    124 undefine TOOL_VCC142_USE_KSUBMIT # for now
    125124ifdef TOOL_VCC142_USE_KSUBMIT
    126125 ifeq ($(KBUILD_HOST),win)
    127   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142_BIN)),-3),64/)
     126  ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC142AMD64_BIN)),/HostX86/)
     127   TOOL_VCC142_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     128  else
    128129   TOOL_VCC142_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    129   else
    130    TOOL_VCC142_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    131130  endif
    132131  ifdef PATH_TOOL_VCC142_DLL_BIN
    … …  
    272271# @param    $(outbase)  Output basename (full). Use this for list files and such.
    273272# @param    $(objsuff)  Object suffix.
     273# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     274#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
    274275TOOL_VCC142_COMPILE_C_DEPEND =
    275276TOOL_VCC142_COMPILE_C_DEPORD =
    … …  
    280281 define TOOL_VCC142_COMPILE_C_CMDS
    281282        $(QUIET)$(TOOL_VCC142_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    282                 -- $(TOOL_VCC142_CC) -c\
     283                -- $(TOOL_VCC142_CC) -c -d1scalableinclude-\
    283284                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    284285                -Fd$(outbase)-obj.pdb \
    … …  
    288289else
    289290 define TOOL_VCC142_COMPILE_C_CMDS
    290         $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CC) -c\
     291        $(QUIET)$(TOOL_VCC142_SETUP_ENV)$(TOOL_VCC142_CC) -c\
    291292                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    292293                -Fd$(outbase)-obj.pdb \
    … …  
    311312# @param    $(outbase)  Output basename (full). Use this for list files and such.
    312313# @param    $(objsuff)  Object suffix.
     314# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     315#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
     316#       ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.)
    313317TOOL_VCC142_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    314318TOOL_VCC142_COMPILE_CXX_DEPORD =
    … …  
    320324 define TOOL_VCC142_COMPILE_CXX_CMDS
    321325        $(QUIET)$(TOOL_VCC142_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    322                 -- $(TOOL_VCC142_CXX) -c\
     326                -- $(TOOL_VCC142_CXX) -c -d1scalableinclude-\
    323327                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    324328                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    330334else
    331335 define TOOL_VCC142_COMPILE_CXX_CMDS
    332         $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CXX) -c\
     336        $(QUIET)$(TOOL_VCC142_SETUP_ENV)$(TOOL_VCC142_CXX) -c\
    333337                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    334338                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    365369        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    366370        $(QUIET)$(TOOL_VCC142_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    367                 -- $(TOOL_VCC142_CXX) -c -Yc\
     371                -- $(TOOL_VCC142_CXX) -c -Yc -d1scalableinclude-\
    368372                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    369373               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    376380 define TOOL_VCC142-PCH_COMPILE_CXX_CMDS
    377381        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    378         $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CXX) -c -Yc\
     382        $(QUIET)$(TOOL_VCC142_SETUP_ENV)$(TOOL_VCC142_CXX) -c -Yc\
    379383                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    380384               -Fp$($(target)_1_VCC_PCH_FILE) \

  • trunk/kBuild/tools/VCC142AMD64.kmk

    r3346 r3370  
    9292TOOL_VCC142AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
    9393
    94 undefine TOOL_VCC142AMD64_USE_KSUBMIT # for now
    9594ifdef TOOL_VCC142AMD64_USE_KSUBMIT
    9695 ifeq ($(KBUILD_HOST),win)
    97   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142AMD64_BIN)),-3),64/)
     96  ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC142AMD64_BIN)),/HostX86/)
     97   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     98  else
    9899   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    99   else
    100    TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    101100  endif
    102101  ifdef PATH_TOOL_VCC142AMD64_DLL_BIN
    … …  
    174173# @param    $(outbase)  Output basename (full). Use this for list files and such.
    175174# @param    $(objsuff)  Object suffix.
     175# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     176#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
    176177TOOL_VCC142AMD64_COMPILE_C_DEPEND =
    177178TOOL_VCC142AMD64_COMPILE_C_DEPORD =
    … …  
    182183 define TOOL_VCC142AMD64_COMPILE_C_CMDS
    183184        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    184                 -- $(TOOL_VCC142AMD64_CC) -c\
     185                -- $(TOOL_VCC142AMD64_CC) -c -d1scalableinclude-\
    185186                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    186187                -Fd$(outbase)-obj.pdb \
    … …  
    213214# @param    $(outbase)  Output basename (full). Use this for list files and such.
    214215# @param    $(objsuff)  Object suffix.
     216# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     217#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
     218#       ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.)
    215219TOOL_VCC142AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    216220TOOL_VCC142AMD64_COMPILE_CXX_DEPORD =
    … …  
    222226 define TOOL_VCC142AMD64_COMPILE_CXX_CMDS
    223227        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    224                 -- $(TOOL_VCC142AMD64_CXX) -c\
     228                -- $(TOOL_VCC142AMD64_CXX) -c -d1scalableinclude-\
    225229                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    226230                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    267271        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    268272        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    269                 -- $(TOOL_VCC142AMD64_CXX) -c -Yc\
     273                -- $(TOOL_VCC142AMD64_CXX) -c -Yc -d1scalableinclude-\
    270274                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    271275               -Fp$($(target)_1_VCC_PCH_FILE) \

  • trunk/kBuild/tools/VCC142X86.kmk

    r3346 r3370  
    9292TOOL_VCC142X86_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
    9393
    94 undefine TOOL_VCC142X86_USE_KSUBMIT # for now
    9594ifdef TOOL_VCC142X86_USE_KSUBMIT
    9695 ifeq ($(KBUILD_HOST),win)
    97   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142X86_BIN)),-3),64/)
     96  ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC142X86_BIN)),/HostX86/)
     97   TOOL_VCC142X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     98  else
    9899   TOOL_VCC142X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    99   else
    100    TOOL_VCC142X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    101100  endif
    102101  ifdef PATH_TOOL_VCC142X86_DLL_BIN
    … …  
    174173# @param    $(outbase)  Output basename (full). Use this for list files and such.
    175174# @param    $(objsuff)  Object suffix.
     175# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     176#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
    176177TOOL_VCC142X86_COMPILE_C_DEPEND =
    177178TOOL_VCC142X86_COMPILE_C_DEPORD =
    … …  
    182183 define TOOL_VCC142X86_COMPILE_C_CMDS
    183184        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    184                 -- $(TOOL_VCC142X86_CC) -c\
     185                -- $(TOOL_VCC142X86_CC) -c -d1scalableinclude-\
    185186                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    186187                -Fd$(outbase)-obj.pdb \
    … …  
    213214# @param    $(outbase)  Output basename (full). Use this for list files and such.
    214215# @param    $(objsuff)  Object suffix.
     216# @note The -d1scalableinclude- option disables include directory caching as the cache goes
     217#       stale in kWorker.  Besides, kWorker does it's own caching, so it is not necessary.
     218#       ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.)
    215219TOOL_VCC142X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    216220TOOL_VCC142X86_COMPILE_CXX_DEPORD =
    … …  
    222226 define TOOL_VCC142X86_COMPILE_CXX_CMDS
    223227        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    224                 -- $(TOOL_VCC142X86_CXX) -c\
     228                -- $(TOOL_VCC142X86_CXX) -c -d1scalableinclude-\
    225229                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    226230                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    267271        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    268272        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    269                 -- $(TOOL_VCC142X86_CXX) -c -Yc\
     273                -- $(TOOL_VCC142X86_CXX) -c -Yc -d1scalableinclude-\
    270274                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    271275               -Fp$($(target)_1_VCC_PCH_FILE) \
Note: See TracChangeset for help on using the changeset viewer.

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