VirtualBox

Changeset 2895 in kBuild


Ignore:
Timestamp:
Sep 8, 2016 1:28:37 PM (8 years ago)
Author:
bird
Message:

Use kObjDep more.

Location:
trunk/kBuild
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/kBuild/header.kmk

    r2887 r2895  
    636636DEP_IDB_INT := kmk_builtin_kDepIDB
    637637DEP_IDB     := $(DEP_IDB_INT)
     638
     639DEP_OBJ_EXT := $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE)
     640DEP_OBJ_INT := kmk_builtin_kDepObj
     641DEP_OBJ     := $(DEP_OBJ_INT)
    638642
    639643DEP_PRE     := $(KBUILD_BIN_PATH)/kDepPre$(HOSTSUFF_EXE)
  • trunk/kBuild/tools/OPENWATCOM-16.kmk

    r2749 r2895  
    4444TOOL_OPENWATCOM-16_COMPILE_AS_DEPEND =
    4545TOOL_OPENWATCOM-16_COMPILE_AS_DEPORD =
    46 TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT = $(obj).err
     46TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT_MAYBE = $(obj).err
     47ifdef TOOL_OPENWATCOM_USE_KSUBMIT
     48define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
     49        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     50                $(TOOL_OPENWATCOM_AS) \
     51                $(flags) \
     52                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     53                $(addprefix -d, $(defs)) \
     54                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     55                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     56                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     57endef
     58else
    4759define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
    4860        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
     
    5365                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    5466                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    55         $(QUIET)$(APPEND) -n $(obj).err
    56 ## @todo dependencies
    57 endef
     67        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     68endef
     69endif
    5870
    5971TOOL_OPENWATCOM-16_COMPILE_C_DEPEND =
    6072TOOL_OPENWATCOM-16_COMPILE_C_DEPORD =
    61 TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT = $(obj).err
     73TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT_MAYBE = $(obj).err
     74ifdef TOOL_OPENWATCOM_USE_KSUBMIT
    6275define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
    63         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC16) \
    64                 $(flags) \
    65                 $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    66                 $(addprefix -d, $(defs)) \
    67                 -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
    68                 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    69                 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    70         $(QUIET)$(APPEND) -n $(obj).err
    71 ## @todo dependencies
    72 endef
     76        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     77                $(TOOL_OPENWATCOM_CC16) \
     78                $(flags) \
     79                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     80                $(addprefix -d, $(defs)) \
     81                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     82                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     83                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     84endef
     85else
     86define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
     87        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC16) \
     88                $(flags) \
     89                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     90                $(addprefix -d, $(defs)) \
     91                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     92                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     93                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     94        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     95endef
     96endif
    7397
    7498TOOL_OPENWATCOM-16_COMPILE_CXX_DEPEND =
    7599TOOL_OPENWATCOM-16_COMPILE_CXX_DEPORD =
    76 TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT = $(obj).err
     100TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT_MAYBE = $(obj).err
     101ifdef TOOL_OPENWATCOM_USE_KSUBMIT
    77102define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
    78         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX16) \
    79                 $(flags) \
    80                 $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    81                 $(addprefix -d, $(defs)) \
    82                 -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
    83                 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    84                 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    85         $(QUIET)$(APPEND) -n $(obj).err
    86 ## @todo dependencies
    87 endef
     103        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     104                $(TOOL_OPENWATCOM_CXX16) \
     105                $(flags) \
     106                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     107                $(addprefix -d, $(defs)) \
     108                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     109                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     110                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     111endef
     112else
     113define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
     114        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX16) \
     115                $(flags) \
     116                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     117                $(addprefix -d, $(defs)) \
     118                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     119                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     120                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     121        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     122endef
     123endif
    88124
    89125TOOL_OPENWATCOM-16_COMPILE_RC_OUTPUT =
     
    91127TOOL_OPENWATCOM-16_COMPILE_RC_DEPORD =
    92128define TOOL_OPENWATCOM-16_COMPILE_RC_CMDS
    93         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) \
     129        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
    94130                $(TOOL_OPENWATCOM_RC) -r\
    95131                $(flags) \
  • trunk/kBuild/tools/OPENWATCOM.kmk

    r2882 r2895  
    5454 # Resolve any fancy stuff once and for all.
    5555 PATH_TOOL_OPENWATCOM := $(PATH_TOOL_OPENWATCOM)
     56endif
     57
     58# Clear the feature indicator if not available on the current host.
     59ifdef TOOL_OPENWATCOM_USE_KSUBMIT
     60 ifneq ($(KBUILD_HOST),win)
     61  override TOOL_OPENWATCOM_USE_KSUBMIT :=
     62 endif
    5663endif
    5764
     
    149156
    150157if $(KBUILD_KMK_REVISION) >= 2747
    151  TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1,$2 --wcc-brain-damage)
     158 TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1, --wcc-brain-damage $2)
    152159else
    153160 TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1,$2)
     
    208215TOOL_OPENWATCOM_COMPILE_AS_DEPEND =
    209216TOOL_OPENWATCOM_COMPILE_AS_DEPORD =
    210 TOOL_OPENWATCOM_COMPILE_AS_OUTPUT = $(obj).err
     217TOOL_OPENWATCOM_COMPILE_AS_OUTPUT_MAYBE = $(obj).err
     218ifdef TOOL_OPENWATCOM_USE_KSUBMIT
    211219define TOOL_OPENWATCOM_COMPILE_AS_CMDS
    212         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
    213                 $(flags) \
    214                 $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    215                 $(addprefix -d, $(defs)) \
    216                 -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
    217                 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    218                 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    219         $(QUIET)$(APPEND) -n $(obj).err
    220 ## @todo dependencies
    221 endef
     220        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     221                $(TOOL_OPENWATCOM_AS) \
     222                $(flags) \
     223                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     224                $(addprefix -d, $(defs)) \
     225                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     226                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     227                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     228endef
     229else
     230define TOOL_OPENWATCOM_COMPILE_AS_CMDS
     231        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
     232                $(flags) \
     233                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     234                $(addprefix -d, $(defs)) \
     235                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     236                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     237                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     238        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     239endef
     240endif
    222241
    223242
    224243TOOL_OPENWATCOM_COMPILE_C_DEPEND =
    225244TOOL_OPENWATCOM_COMPILE_C_DEPORD =
    226 TOOL_OPENWATCOM_COMPILE_C_OUTPUT = $(obj).err
     245TOOL_OPENWATCOM_COMPILE_C_OUTPUT_MAYBE = $(obj).err
     246ifdef TOOL_OPENWATCOM_USE_KSUBMIT
     247define TOOL_OPENWATCOM_COMPILE_C_CMDS
     248        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     249                $(TOOL_OPENWATCOM_CC) \
     250                $(flags) \
     251                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     252                $(addprefix -d, $(defs)) \
     253                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     254                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     255                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     256endef
     257else
    227258define TOOL_OPENWATCOM_COMPILE_C_CMDS
    228259        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC) \
     
    233264                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    234265                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    235         $(QUIET)$(APPEND) -n $(obj).err
    236 ## @todo dependencies
    237 endef
     266        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     267endef
     268endif
    238269
    239270TOOL_OPENWATCOM_COMPILE_CXX_DEPEND =
    240271TOOL_OPENWATCOM_COMPILE_CXX_DEPORD =
    241 TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT = $(obj).err
     272TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT_MAYBE = $(obj).err
     273ifdef TOOL_OPENWATCOM_USE_KSUBMIT
    242274define TOOL_OPENWATCOM_COMPILE_CXX_CMDS
    243         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX) \
    244                 $(flags) \
    245                 $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    246                 $(addprefix -d, $(defs)) \
    247                 -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
    248                 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
    249                 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
    250         $(QUIET)$(APPEND) -n $(obj).err
    251 ## @todo dependencies
    252 endef
     275        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
     276                $(TOOL_OPENWATCOM_CXX) \
     277                $(flags) \
     278                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     279                $(addprefix -d, $(defs)) \
     280                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     281                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     282                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     283endef
     284else
     285define TOOL_OPENWATCOM_COMPILE_CXX_CMDS
     286        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX) \
     287                $(flags) \
     288                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
     289                $(addprefix -d, $(defs)) \
     290                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
     291                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
     292                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
     293        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
     294endef
     295endif
    253296
    254297TOOL_OPENWATCOM_COMPILE_RC_OUTPUT =
     
    256299TOOL_OPENWATCOM_COMPILE_RC_DEPORD =
    257300define TOOL_OPENWATCOM_COMPILE_RC_CMDS
    258         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) \
     301        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
    259302                $(TOOL_OPENWATCOM_RC) -r\
    260303                $(flags) \
  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2870 r2895  
    7878 ifeq ($(KBUILD_HOST),win)
    7979  ifneq ($(substr $(PATH_TOOL_VCC100AMD64_BIN),-9),x86_amd64)
    80    TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit --
     80   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    8181  else
    82    TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
     82   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    8383  endif
    8484 endif
     
    172172TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
    173173TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
     174 ifdef TOOL_VCC100AMD64_KSUBMIT
    174175define TOOL_VCC100AMD64_COMPILE_C_CMDS
    175         $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_CC) -c\
     176        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     177                -- $(TOOL_VCC100AMD64_CC) -c\
    176178                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    177179                -Fd$(outbase)-obj.pdb \
     
    179181                -Fo$(obj)\
    180182                $(subst /,\\,$(abspath $(source)))
     183endef
     184 else
     185define TOOL_VCC100AMD64_COMPILE_C_CMDS
     186        $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
     187                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     188                -Fd$(outbase)-obj.pdb \
     189                -FD\
     190                -Fo$(obj)\
     191                $(subst /,\\,$(abspath $(source)))
    181192        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    182193endef
     194 endif # !TOOL_VCC100AMD64_KSUBMIT
    183195endif # !KBUILD_USE_KOBJCACHE
    184196
     
    220232TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
    221233TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
     234 ifdef TOOL_VCC100AMD64_KSUBMIT
    222235define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
    223         $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_CXX) -c\
     236        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     237                -- $(TOOL_VCC100AMD64_CXX) -c\
    224238                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    225239                -Fd$(outbase)-obj.pdb \
     
    227241                -Fo$(obj)\
    228242                $(subst /,\\,$(abspath $(source)))
     243endef
     244 else
     245define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     246        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
     247                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     248                -Fd$(outbase)-obj.pdb \
     249                -FD\
     250                -Fo$(obj)\
     251                $(subst /,\\,$(abspath $(source)))
    229252        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    230253endef
     254 endif # !TOOL_VCC100AMD64_KSUBMIT
    231255endif # !KBUILD_USE_KOBJCACHE
    232256
  • trunk/kBuild/tools/VCC100X86.kmk

    r2870 r2895  
    7676ifdef TOOL_VCC100X86_USE_KSUBMIT
    7777 ifeq ($(KBUILD_HOST),win)
    78   TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
     78  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    7979 endif
    8080endif
     
    169169TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
    170170TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
     171 ifdef TOOL_VCC100X86_KSUBMIT
    171172define TOOL_VCC100X86_COMPILE_C_CMDS
    172         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CC) -c\
     173        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     174                -- $(TOOL_VCC100X86_CC) -c\
    173175                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    174176                -Fd$(outbase)-obj.pdb \
     
    176178                -Fo$(obj)\
    177179                $(subst /,\\,$(abspath $(source)))
     180endef
     181 else
     182define TOOL_VCC100X86_COMPILE_C_CMDS
     183        $(QUIET)$(TOOL_VCC100X86_CC) -c\
     184                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     185                -Fd$(outbase)-obj.pdb \
     186                -FD\
     187                -Fo$(obj)\
     188                $(subst /,\\,$(abspath $(source)))
    178189        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    179190endef
     191 endif # !TOOL_VCC100X86_KSUBMIT
    180192endif # !KBUILD_USE_KOBJCACHE
    181193
     
    217229TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
    218230TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
     231 ifdef TOOL_VCC100X86_KSUBMIT
    219232define TOOL_VCC100X86_COMPILE_CXX_CMDS
    220         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CXX) -c\
     233        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     234                -- $(TOOL_VCC100X86_CXX) -c\
    221235                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    222236                -Fd$(outbase)-obj.pdb \
     
    224238                -Fo$(obj)\
    225239                $(subst /,\\,$(abspath $(source)))
     240endef
     241 else
     242define TOOL_VCC100X86_COMPILE_CXX_CMDS
     243        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
     244                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     245                -Fd$(outbase)-obj.pdb \
     246                -FD\
     247                -Fo$(obj)\
     248                $(subst /,\\,$(abspath $(source)))
    226249        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    227250endef
     251 endif # !TOOL_VCC100X86_KSUBMIT
    228252endif # !KBUILD_USE_KOBJCACHE
    229253
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