Changeset 1031 for trunk/kBuild/tools/VCC80.kmk

Timestamp:

Jun 4, 2007, 3:56:58 AM (18 years ago)

Author:

bird

Message:

MAYBE output. removed some obsolete stuff.

File:

• trunk/kBuild/tools/VCC80.kmk (modified) (9 diffs)

trunk/kBuild/tools/VCC80.kmk

@@ -142 +142 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC80_COMPILE_C_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
 TOOL_VCC80_COMPILE_C_DEPEND =
 TOOL_VCC80_COMPILE_C_DEPORD =
-ifndef VCC80_OLD_DEPS
+TOOL_VCC80_COMPILE_C_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
 define TOOL_VCC80_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC80_CC) -c\
@@ -155 +154 @@
         $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
 endef
-else
-define TOOL_VCC80_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC80_CC) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase)-obj.pdb \
-                -Fo$(obj)\
-                $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(TOOL_VCC80_CC) -E\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(subst /,\\,$(abspath $(source)))\
-                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
-endef
-endif
 
 
@@ -183 +169 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC80_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
 TOOL_VCC80_COMPILE_CXX_DEPEND =
 TOOL_VCC80_COMPILE_CXX_DEPORD =
-ifndef VCC80_OLD_DEPS
+TOOL_VCC80_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
 define TOOL_VCC80_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC80_CXX) -c\
@@ -196 +181 @@
         $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
 endef
-else
-define TOOL_VCC80_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC80_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase)-obj.pdb \
-                -Fo$(obj)\
-                $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(TOOL_VCC80_CXX) -E\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(subst /,\\,$(abspath $(source)))\
-                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
-endef
-endif
 
 
@@ -247 +219 @@
 TOOL_VCC80_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC80_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
-TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb $(outbase).rsp
+TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC80_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC80_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -n $(outbase).rsp \
@@ -258 +230 @@
         $(QUIET)$(TOOL_VCC80_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
-else
-TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC80_LINK_LIBRARY_CMDS
-        $(QUIET)$(TOOL_VCC80_AR) $(flags) /OUT:$(out) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
-                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
-endef
-endif
 
 
@@ -283 +248 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
 TOOL_VCC80_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80_LINK_PROGRAM_DEPORD =
+TOOL_VCC80_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_VCC80_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
 define TOOL_VCC80_LINK_PROGRAM_CMDS
         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
@@ -316 +282 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
 TOOL_VCC80_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
+TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
+TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest
 define TOOL_VCC80_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
@@ -356 +323 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
 TOOL_VCC80_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80_LINK_SYSMOD_DEPORD =
+TOOL_VCC80_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VCC80_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
 define TOOL_VCC80_LINK_SYSMOD_CMDS
         $(QUIET)$(TOOL_VCC80_LD) $(flags) \