Changeset 2557 for trunk/kBuild/tools/VCC70.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/VCC70.kmk (modified) (10 diffs)

trunk/kBuild/tools/VCC70.kmk

@@ -240 +240 @@
 TOOL_VCC70_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC70_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) -n $(outbase).rsp \
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
                         $(subst /,\\,$(objs) \
@@ -264 +264 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
+TOOL_VCC70_LINK_PROGRAM_OUTPUT = $(outbase).rsp
 TOOL_VCC70_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).ilk
 TOOL_VCC70_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
@@ -270 +271 @@
 TOOL_VCC70_LINK_PROGRAM_DEPORD =
 define TOOL_VCC70_LINK_PROGRAM_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC70_LD) $(flags) \
                 /OUT:$(out) \
@@ -277 +283 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
+                @$(outbase).rsp
 endef
 
@@ -296 +301 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
+TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
 TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
 TOOL_VCC70_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
@@ -303 +308 @@
 TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
 define TOOL_VCC70_LINK_DLL_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC70_LD) $(flags) \
                 /OUT:$(out) \
@@ -312 +322 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
+                @$(outbase).rsp
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
 $(eval _DIRS += $(PATH_STAGE_LIB))
@@ -333 +342 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC70_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VCC70_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
 TOOL_VCC70_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk
 TOOL_VCC70_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
@@ -340 +349 @@
 TOOL_VCC70_LINK_SYSMOD_DEPORD =
 define TOOL_VCC70_LINK_SYSMOD_CMDS
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(foreach arg,\
+                    $(subst /,\\,$(objs)) \
+                    $(subst /,\\,$(libs)) \
+                        ,\"$(arg)\")
         $(QUIET)$(TOOL_VCC70_LD) $(flags) \
                 /OUT:$(out) \
@@ -347 +361 @@
                 $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
-                $(subst /,\\,$(objs)) \
-                $(subst /,\\,$(libs))
-endef
-
+                @$(outbase).rsp
+endef
+