Changeset 2557 for trunk/kBuild/tools/VCC100AMD64.kmk

Timestamp:

Dec 13, 2011, 1:48:32 PM (14 years ago)

Author:

bird

Message:

tools/VCC*.kmk: Use response files when linking.

File:

• trunk/kBuild/tools/VCC100AMD64.kmk (modified) (7 diffs)

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -247 +247 @@
 TOOL_VCC100AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC100AMD64_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) -n $(outbase).rsp \
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
                         $(subst /,\\,$(objs) \
@@ -273 +273 @@
 TOOL_VCC100AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC100AMD64_LINK_PROGRAM_DEPORD =
-TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
 TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
 TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
 TOOL_VCC100AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
 define TOOL_VCC100AMD64_LINK_PROGRAM_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
                 /OUT:$(out) \
@@ -285 +290 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
+                @$(outbase).rsp
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
@@ -308 +312 @@
 TOOL_VCC100AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
+TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
 TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
 TOOL_VCC100AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
 TOOL_VCC100AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
 define TOOL_VCC100AMD64_LINK_DLL_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
                 /OUT:$(out) \
@@ -322 +331 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
+                @$(outbase).rsp
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
@@ -347 +355 @@
 TOOL_VCC100AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC100AMD64_LINK_SYSMOD_DEPORD =
-TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
 TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
 TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
 TOOL_VCC100AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
 define TOOL_VCC100AMD64_LINK_SYSMOD_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
                 /OUT:$(out) \
@@ -359 +372 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
+                @$(outbase).rsp
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'