Changeset 2895 in kBuild
- Timestamp:
- Sep 8, 2016 1:28:37 PM (8 years ago)
- Location:
- trunk/kBuild
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/header.kmk
r2887 r2895 636 636 DEP_IDB_INT := kmk_builtin_kDepIDB 637 637 DEP_IDB := $(DEP_IDB_INT) 638 639 DEP_OBJ_EXT := $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) 640 DEP_OBJ_INT := kmk_builtin_kDepObj 641 DEP_OBJ := $(DEP_OBJ_INT) 638 642 639 643 DEP_PRE := $(KBUILD_BIN_PATH)/kDepPre$(HOSTSUFF_EXE) -
trunk/kBuild/tools/OPENWATCOM-16.kmk
r2749 r2895 44 44 TOOL_OPENWATCOM-16_COMPILE_AS_DEPEND = 45 45 TOOL_OPENWATCOM-16_COMPILE_AS_DEPORD = 46 TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT = $(obj).err 46 TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT_MAYBE = $(obj).err 47 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 48 define 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))) 57 endef 58 else 47 59 define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS 48 60 $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \ … … 53 65 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \ 54 66 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source))) 55 $(QUIET)$( APPEND) -n $(obj).err56 ## @todo dependencies 57 end ef67 $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)" 68 endef 69 endif 58 70 59 71 TOOL_OPENWATCOM-16_COMPILE_C_DEPEND = 60 72 TOOL_OPENWATCOM-16_COMPILE_C_DEPORD = 61 TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT = $(obj).err 73 TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT_MAYBE = $(obj).err 74 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 62 75 define 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))) 84 endef 85 else 86 define 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)" 95 endef 96 endif 73 97 74 98 TOOL_OPENWATCOM-16_COMPILE_CXX_DEPEND = 75 99 TOOL_OPENWATCOM-16_COMPILE_CXX_DEPORD = 76 TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT = $(obj).err 100 TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT_MAYBE = $(obj).err 101 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 77 102 define 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))) 111 endef 112 else 113 define 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)" 122 endef 123 endif 88 124 89 125 TOOL_OPENWATCOM-16_COMPILE_RC_OUTPUT = … … 91 127 TOOL_OPENWATCOM-16_COMPILE_RC_DEPORD = 92 128 define TOOL_OPENWATCOM-16_COMPILE_RC_CMDS 93 $(QUIET) 129 $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \ 94 130 $(TOOL_OPENWATCOM_RC) -r\ 95 131 $(flags) \ -
trunk/kBuild/tools/OPENWATCOM.kmk
r2882 r2895 54 54 # Resolve any fancy stuff once and for all. 55 55 PATH_TOOL_OPENWATCOM := $(PATH_TOOL_OPENWATCOM) 56 endif 57 58 # Clear the feature indicator if not available on the current host. 59 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 60 ifneq ($(KBUILD_HOST),win) 61 override TOOL_OPENWATCOM_USE_KSUBMIT := 62 endif 56 63 endif 57 64 … … 149 156 150 157 if $(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) 152 159 else 153 160 TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1,$2) … … 208 215 TOOL_OPENWATCOM_COMPILE_AS_DEPEND = 209 216 TOOL_OPENWATCOM_COMPILE_AS_DEPORD = 210 TOOL_OPENWATCOM_COMPILE_AS_OUTPUT = $(obj).err 217 TOOL_OPENWATCOM_COMPILE_AS_OUTPUT_MAYBE = $(obj).err 218 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 211 219 define 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))) 228 endef 229 else 230 define 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)" 239 endef 240 endif 222 241 223 242 224 243 TOOL_OPENWATCOM_COMPILE_C_DEPEND = 225 244 TOOL_OPENWATCOM_COMPILE_C_DEPORD = 226 TOOL_OPENWATCOM_COMPILE_C_OUTPUT = $(obj).err 245 TOOL_OPENWATCOM_COMPILE_C_OUTPUT_MAYBE = $(obj).err 246 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 247 define 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))) 256 endef 257 else 227 258 define TOOL_OPENWATCOM_COMPILE_C_CMDS 228 259 $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC) \ … … 233 264 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \ 234 265 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source))) 235 $(QUIET)$( APPEND) -n $(obj).err236 ## @todo dependencies 237 end ef266 $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)" 267 endef 268 endif 238 269 239 270 TOOL_OPENWATCOM_COMPILE_CXX_DEPEND = 240 271 TOOL_OPENWATCOM_COMPILE_CXX_DEPORD = 241 TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT = $(obj).err 272 TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT_MAYBE = $(obj).err 273 ifdef TOOL_OPENWATCOM_USE_KSUBMIT 242 274 define 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))) 283 endef 284 else 285 define 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)" 294 endef 295 endif 253 296 254 297 TOOL_OPENWATCOM_COMPILE_RC_OUTPUT = … … 256 299 TOOL_OPENWATCOM_COMPILE_RC_DEPORD = 257 300 define TOOL_OPENWATCOM_COMPILE_RC_CMDS 258 $(QUIET) 301 $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \ 259 302 $(TOOL_OPENWATCOM_RC) -r\ 260 303 $(flags) \ -
trunk/kBuild/tools/VCC100AMD64.kmk
r2870 r2895 78 78 ifeq ($(KBUILD_HOST),win) 79 79 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 81 81 else 82 TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --82 TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit 83 83 endif 84 84 endif … … 172 172 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) 173 173 TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) 174 ifdef TOOL_VCC100AMD64_KSUBMIT 174 175 define 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\ 176 178 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 177 179 -Fd$(outbase)-obj.pdb \ … … 179 181 -Fo$(obj)\ 180 182 $(subst /,\\,$(abspath $(source))) 183 endef 184 else 185 define 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))) 181 192 $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb) 182 193 endef 194 endif # !TOOL_VCC100AMD64_KSUBMIT 183 195 endif # !KBUILD_USE_KOBJCACHE 184 196 … … 220 232 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) 221 233 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) 234 ifdef TOOL_VCC100AMD64_KSUBMIT 222 235 define 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\ 224 238 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 225 239 -Fd$(outbase)-obj.pdb \ … … 227 241 -Fo$(obj)\ 228 242 $(subst /,\\,$(abspath $(source))) 243 endef 244 else 245 define 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))) 229 252 $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb) 230 253 endef 254 endif # !TOOL_VCC100AMD64_KSUBMIT 231 255 endif # !KBUILD_USE_KOBJCACHE 232 256 -
trunk/kBuild/tools/VCC100X86.kmk
r2870 r2895 76 76 ifdef TOOL_VCC100X86_USE_KSUBMIT 77 77 ifeq ($(KBUILD_HOST),win) 78 TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --78 TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit 79 79 endif 80 80 endif … … 169 169 TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb) 170 170 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) 171 ifdef TOOL_VCC100X86_KSUBMIT 171 172 define 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\ 173 175 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 174 176 -Fd$(outbase)-obj.pdb \ … … 176 178 -Fo$(obj)\ 177 179 $(subst /,\\,$(abspath $(source))) 180 endef 181 else 182 define 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))) 178 189 $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb) 179 190 endef 191 endif # !TOOL_VCC100X86_KSUBMIT 180 192 endif # !KBUILD_USE_KOBJCACHE 181 193 … … 217 229 TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb) 218 230 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) 231 ifdef TOOL_VCC100X86_KSUBMIT 219 232 define 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\ 221 235 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ 222 236 -Fd$(outbase)-obj.pdb \ … … 224 238 -Fo$(obj)\ 225 239 $(subst /,\\,$(abspath $(source))) 240 endef 241 else 242 define 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))) 226 249 $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb) 227 250 endef 251 endif # !TOOL_VCC100X86_KSUBMIT 228 252 endif # !KBUILD_USE_KOBJCACHE 229 253
Note:
See TracChangeset
for help on using the changeset viewer.