Changeset 840

Timestamp:

Feb 4, 2007, 11:28:28 AM (18 years ago)

Author:

bird

Message:

Use response files everywhere.

File:

• trunk/kBuild/tools/GCC3OMF.kmk (modified) (3 diffs)

trunk/kBuild/tools/GCC3OMF.kmk

@@ -192 +192 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map
-TOOL_GCC3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-        $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_GCC3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_GCC3OMF_LINK_PROGRAM_DEPORD =
 define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_LD) $(flags) -o $(out) $(objs)\
-                $(filter %.def, $(othersrc))\
+        $(QUIET)$(APPEND) -n $(outbase).rsp\
+                $(flags)\
+                -o $(out)\
+                $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
+                $(othersrc)\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                $(call TOOL_GCC3_LD_MAP,$(outbase).map)
+                -Zmap=$(outbase).map
+        $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp
 endef
 
@@ -219 +222 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map
-TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-        $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_GCC3OMF_LINK_DLL_DEPORD =
 define TOOL_GCC3OMF_LINK_DLL_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_LD) $(TOOL_GCC3OMF_LDFLAGS.dll) $(flags) -o $(out) $(objs)\
-                $(filter %.def, $(othersrc))\
+        $(QUIET)$(APPEND) -n $(outbase).rsp\
+                $(TOOL_GCC3OMF_LDFLAGS.dll)\
+                $(flags)\
+                -o $(out)\
+                $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
+                $(othersrc)\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                $(call TOOL_GCC3_LD_MAP,$(outbase).map)
-endef
+                -Zmap=$(outbase).map
+        $(TOOL_GCC3OMF_LD) @$(outbase).rsp
+endef
+
 
 ## Link system module (windows aka driver, linux aka kernel module)
@@ -245 +253 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map
-TOOL_GCC3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-         $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_GCC3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_GCC3OMF_LINK_SYSMOD_DEPORD =
 define TOOL_GCC3OMF_LINK_SYSMOD_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_LD_SYSMOD) $(TOOL_GCC3OMF_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
-                $(filter %.def, $(othersrc))\
+        $(QUIET)$(APPEND) -n $(outbase).rsp\
+                $(TOOL_GCC3OMF_LDFLAGS.sysmod)\
+                $(flags)\
+                -o $(out)\
+                $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
+                $(othersrc)\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                $(call TOOL_GCC3_LD_SYSMOD_MAP,$(outbase).map)
-endef
-
+                -Zmap=$(outbase).map
+        $(QUIET)$(TOOL_GCC3OMF_LD_SYSMOD) @$(outbase).rsp
+endef
+