Changeset 572 for trunk/kBuild

Timestamp:

Oct 19, 2006, 4:19:43 AM (19 years ago)

Author:

bird

Message:

gcc eats .defs on OS/2.

File:

• trunk/kBuild/tools/GCC3.kmk (modified) (4 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -200 +200 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GCC3_LINK_PROGRAM_OUTPUT = $(outbase).map
-TOOL_GCC3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC3_LINK_PROGRAM_DEPORD =
 define TOOL_GCC3_LINK_PROGRAM_CMDS
         $(TOOL_GCC3_LD) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
@@ -224 +226 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GCC3_LINK_DLL_OUTPUT = $(outbase).map
-TOOL_GCC3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC3_LINK_DLL_DEPORD =
 define TOOL_GCC3_LINK_DLL_CMDS
@@ -230 +233 @@
                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out)))\
                 $(objs)\
+                $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
@@ -250 +254 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GCC3_LINK_SYSMOD_OUTPUT = $(outbase).map
-TOOL_GCC3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+                $(filter %.def, $(othersrc))
 TOOL_GCC3_LINK_SYSMOD_DEPORD =
 define TOOL_GCC3_LINK_SYSMOD_CMDS
         $(TOOL_GCC3_LD_SYSMOD) $(TOOL_GCC3_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\