Changeset 2951


Ignore:
Timestamp:
Sep 21, 2016, 1:14:43 PM (9 years ago)
Author:
bird
Message:

VCC100*.kmk: Use kDepObj, drop /FD and related idb-file, drop kObjCache support (useless thanks to slow preprocessing).

Location:
trunk/kBuild/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC100.kmk

    r2795 r2951  
    163163TOOL_VCC100_COMPILE_C_DEPEND =
    164164TOOL_VCC100_COMPILE_C_DEPORD =
    165 ifdef KBUILD_USE_KOBJCACHE
    166 TOOL_VCC100_COMPILE_C_USES_KOBJCACHE = 1
    167 TOOL_VCC100_COMPILE_C_OUTPUT = $(outbase).i
    168 TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE =
    169 define TOOL_VCC100_COMPILE_C_CMDS
    170         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    171                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    172                 --kObjCache-cpp $(outbase).i\
    173                 $(TOOL_VCC100_CC) -E\
    174                 $(subst -Zi,-Z7,$(flags))\
    175                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    176                 $(subst /,\\,$(abspath $(source))) \
    177                 --kObjCache-cc $(obj)\
    178                 $(TOOL_VCC100_CC) -c\
    179                 $(subst -Zi,-Z7,$(flags))\
    180                 -Fo$(obj)\
    181                 $(outbase).i
    182 endef
    183 else  # !KBUILD_USE_KOBJCACHE
    184 TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
    185 TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
     165TOOL_VCC100_COMPILE_C_OUTPUT =
     166TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
    186167define TOOL_VCC100_COMPILE_C_CMDS
    187168        $(QUIET)$(TOOL_VCC100_CC) -c\
    188169                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    189170                -Fd$(outbase)-obj.pdb \
    190                 -FD\
    191171                -Fo$(obj)\
    192172                $(subst /,\\,$(abspath $(source)))
    193         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    194 endef
    195 endif # !KBUILD_USE_KOBJCACHE
     173        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     174endef
    196175
    197176
    … …  
    211190TOOL_VCC100_COMPILE_CXX_DEPEND =
    212191TOOL_VCC100_COMPILE_CXX_DEPORD =
    213 ifdef KBUILD_USE_KOBJCACHE
    214 TOOL_VCC100_COMPILE_CXX_USES_KOBJCACHE = 1
    215 TOOL_VCC100_COMPILE_CXX_OUTPUT = $(outbase).ii
    216 TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE =
    217 define TOOL_VCC100_COMPILE_CXX_CMDS
    218         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    219                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    220                 --kObjCache-cpp $(outbase).ii\
    221                 $(TOOL_VCC100_CXX) -E\
    222                 $(subst -Zi,-Z7,$(flags))\
    223                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    224                 $(subst /,\\,$(abspath $(source))) \
    225                 --kObjCache-cc $(obj)\
    226                 $(TOOL_VCC100_CXX) -c\
    227                 $(subst -Zi,-Z7,$(flags))\
    228                 -Fo$(obj)\
    229                 $(outbase).ii
    230 endef
    231 else  # !KBUILD_USE_KOBJCACHE
    232 TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
    233 TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
     192TOOL_VCC100_COMPILE_CXX_OUTPUT =
     193TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
    234194define TOOL_VCC100_COMPILE_CXX_CMDS
    235195        $(QUIET)$(TOOL_VCC100_CXX) -c\
    236196                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    237197                -Fd$(outbase)-obj.pdb \
    238                 -FD\
    239198                -Fo$(obj)\
    240199                $(subst /,\\,$(abspath $(source)))
    241         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    242 endef
    243 endif # !KBUILD_USE_KOBJCACHE
     200        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     201endef
    244202
    245203## @todo configure the assembler template.

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2919 r2951  
    155155TOOL_VCC100AMD64_COMPILE_C_DEPEND =
    156156TOOL_VCC100AMD64_COMPILE_C_DEPORD =
    157 ifdef KBUILD_USE_KOBJCACHE
    158 TOOL_VCC100AMD64_COMPILE_C_USES_KOBJCACHE = 1
    159 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(outbase).i
    160 TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE =
    161 define TOOL_VCC100AMD64_COMPILE_C_CMDS
    162         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    163                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    164                 --kObjCache-cpp $(outbase).i\
    165                 $(TOOL_VCC100AMD64_CC) -E\
    166                 $(subst -Zi,-Z7,$(flags))\
    167                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    168                 $(subst /,\\,$(abspath $(source))) \
    169                 --kObjCache-cc $(obj)\
    170                 $(TOOL_VCC100AMD64_CC) -c\
    171                 $(subst -Zi,-Z7,$(flags))\
    172                 -Fo$(obj)\
    173                 $(outbase).i
    174 endef
    175 else  # !KBUILD_USE_KOBJCACHE
    176 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
    177 TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    178  ifdef TOOL_VCC100AMD64_KSUBMIT
    179 define TOOL_VCC100AMD64_COMPILE_C_CMDS
     157TOOL_VCC100AMD64_COMPILE_C_OUTPUT =
     158TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     159ifdef TOOL_VCC100AMD64_KSUBMIT
     160 TOOL_VCC100AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
     161 define TOOL_VCC100AMD64_COMPILE_C_CMDS
    180162        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    181163                -- $(TOOL_VCC100AMD64_CC) -c\
    182164                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    183165                -Fd$(outbase)-obj.pdb \
    184                 -FD\
    185166                -Fo$(obj)\
    186167                $(subst /,\\,$(abspath $(source)))
    187 endef
    188  else
    189 define TOOL_VCC100AMD64_COMPILE_C_CMDS
     168 endef
     169else
     170 define TOOL_VCC100AMD64_COMPILE_C_CMDS
    190171        $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
    191172                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    192173                -Fd$(outbase)-obj.pdb \
    193                 -FD\
    194174                -Fo$(obj)\
    195175                $(subst /,\\,$(abspath $(source)))
    196         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    197 endef
    198  endif # !TOOL_VCC100AMD64_KSUBMIT
    199 endif # !KBUILD_USE_KOBJCACHE
     176        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     177 endef
     178endif # !TOOL_VCC100AMD64_KSUBMIT
    200179
    201180
    … …  
    215194TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
    216195TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
    217 ifdef KBUILD_USE_KOBJCACHE
    218 TOOL_VCC100AMD64_COMPILE_CXX_USES_KOBJCACHE = 1
    219 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(outbase).ii
    220 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE =
    221 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    222         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    223                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    224                 --kObjCache-cpp $(outbase).ii\
    225                 $(TOOL_VCC100AMD64_CXX) -E\
    226                 $(subst -Zi,-Z7,$(flags))\
    227                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    228                 $(subst /,\\,$(abspath $(source))) \
    229                 --kObjCache-cc $(obj)\
    230                 $(TOOL_VCC100AMD64_CXX) -c\
    231                 $(subst -Zi,-Z7,$(flags))\
    232                 -Fo$(obj)\
    233                 $(outbase).ii
    234 endef
    235 else  # !KBUILD_USE_KOBJCACHE
    236 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
    237 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
    238  ifdef TOOL_VCC100AMD64_KSUBMIT
    239 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     196TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT =
     197TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     198ifdef TOOL_VCC100AMD64_KSUBMIT
     199 TOOL_VCC100AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
     200 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    240201        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    241202                -- $(TOOL_VCC100AMD64_CXX) -c\
    242203                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    243204                -Fd$(outbase)-obj.pdb \
    244                 -FD\
    245205                -Fo$(obj)\
    246206                $(subst /,\\,$(abspath $(source)))
    247 endef
    248  else
    249 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     207 endef
     208else
     209 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    250210        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
    251211                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    252212                -Fd$(outbase)-obj.pdb \
    253                 -FD\
    254213                -Fo$(obj)\
    255214                $(subst /,\\,$(abspath $(source)))
    256         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    257 endef
    258  endif # !TOOL_VCC100AMD64_KSUBMIT
    259 endif # !KBUILD_USE_KOBJCACHE
     215        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     216 endef
     217endif # !TOOL_VCC100AMD64_KSUBMIT
    260218
    261219## @todo configure the assembler template.

  • trunk/kBuild/tools/VCC100X86.kmk

    r2902 r2951  
    150150TOOL_VCC100X86_COMPILE_C_DEPEND =
    151151TOOL_VCC100X86_COMPILE_C_DEPORD =
    152 ifdef KBUILD_USE_KOBJCACHE
    153 TOOL_VCC100X86_COMPILE_C_USES_KOBJCACHE = 1
    154 TOOL_VCC100X86_COMPILE_C_OUTPUT = $(outbase).i
    155 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE =
    156 define TOOL_VCC100X86_COMPILE_C_CMDS
    157         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    158                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    159                 --kObjCache-cpp $(outbase).i\
    160                 $(TOOL_VCC100X86_CC) -E\
    161                 $(subst -Zi,-Z7,$(flags))\
    162                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    163                 $(subst /,\\,$(abspath $(source))) \
    164                 --kObjCache-cc $(obj)\
    165                 $(TOOL_VCC100X86_CC) -c\
    166                 $(subst -Zi,-Z7,$(flags))\
    167                 -Fo$(obj)\
    168                 $(outbase).i
    169 endef
    170 else  # !KBUILD_USE_KOBJCACHE
    171 TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
    172 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    173  ifdef TOOL_VCC100X86_KSUBMIT
    174 define TOOL_VCC100X86_COMPILE_C_CMDS
     152TOOL_VCC100X86_COMPILE_C_OUTPUT =
     153TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     154ifdef TOOL_VCC100X86_KSUBMIT
     155 TOOL_VCC100X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
     156 define TOOL_VCC100X86_COMPILE_C_CMDS
    175157        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    176158                -- $(TOOL_VCC100X86_CC) -c\
    177159                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    178160                -Fd$(outbase)-obj.pdb \
    179                 -FD\
    180161                -Fo$(obj)\
    181162                $(subst /,\\,$(abspath $(source)))
    182 endef
    183  else
    184 define TOOL_VCC100X86_COMPILE_C_CMDS
     163 endef
     164else
     165 define TOOL_VCC100X86_COMPILE_C_CMDS
    185166        $(QUIET)$(TOOL_VCC100X86_CC) -c\
    186167                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    187168                -Fd$(outbase)-obj.pdb \
    188                 -FD\
    189169                -Fo$(obj)\
    190170                $(subst /,\\,$(abspath $(source)))
    191         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    192 endef
    193  endif # !TOOL_VCC100X86_KSUBMIT
    194 endif # !KBUILD_USE_KOBJCACHE
     171        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     172 endef
     173endif # !TOOL_VCC100X86_KSUBMIT
    195174
    196175
    … …  
    210189TOOL_VCC100X86_COMPILE_CXX_DEPEND =
    211190TOOL_VCC100X86_COMPILE_CXX_DEPORD =
    212 ifdef KBUILD_USE_KOBJCACHE
    213 TOOL_VCC100X86_COMPILE_CXX_USES_KOBJCACHE = 1
    214 TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(outbase).ii
    215 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE =
    216 define TOOL_VCC100X86_COMPILE_CXX_CMDS
    217         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
    218                 --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
    219                 --kObjCache-cpp $(outbase).ii\
    220                 $(TOOL_VCC100X86_CXX) -E\
    221                 $(subst -Zi,-Z7,$(flags))\
    222                 $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    223                 $(subst /,\\,$(abspath $(source))) \
    224                 --kObjCache-cc $(obj)\
    225                 $(TOOL_VCC100X86_CXX) -c\
    226                 $(subst -Zi,-Z7,$(flags))\
    227                 -Fo$(obj)\
    228                 $(outbase).ii
    229 endef
    230 else  # !KBUILD_USE_KOBJCACHE
    231 TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
    232 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
    233  ifdef TOOL_VCC100X86_KSUBMIT
    234 define TOOL_VCC100X86_COMPILE_CXX_CMDS
     191TOOL_VCC100X86_COMPILE_CXX_OUTPUT =
     192TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     193ifdef TOOL_VCC100X86_KSUBMIT
     194 TOOL_VCC100X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
     195 define TOOL_VCC100X86_COMPILE_CXX_CMDS
    235196        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    236197                -- $(TOOL_VCC100X86_CXX) -c\
    237198                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    238199                -Fd$(outbase)-obj.pdb \
    239                 -FD\
    240200                -Fo$(obj)\
    241201                $(subst /,\\,$(abspath $(source)))
    242 endef
    243  else
    244 define TOOL_VCC100X86_COMPILE_CXX_CMDS
     202 endef
     203else
     204 define TOOL_VCC100X86_COMPILE_CXX_CMDS
    245205        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
    246206                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    247207                -Fd$(outbase)-obj.pdb \
    248                 -FD\
    249208                -Fo$(obj)\
    250209                $(subst /,\\,$(abspath $(source)))
    251         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    252 endef
    253  endif # !TOOL_VCC100X86_KSUBMIT
    254 endif # !KBUILD_USE_KOBJCACHE
     210        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
     211 endef
     212endif # !TOOL_VCC100X86_KSUBMIT
    255213
    256214## @todo configure the assembler template.
Note: See TracChangeset for help on using the changeset viewer.