Changeset 2083 in kBuild

Timestamp:

Nov 19, 2008 2:32:35 AM (16 years ago)

Author:

bird

Message:

some OPENWATCOM-WL adjustments.

File:

• trunk/kBuild/tools/OPENWATCOM-WL.kmk (modified) (2 diffs)

trunk/kBuild/tools/OPENWATCOM-WL.kmk

@@ -35 +35 @@
 TOOL_OPENWATCOM-WL = Open Watcom v1.4 and later, using wlink.
 TOOL_OPENWATCOM-WL_EXTENDS = OPENWATCOM
+TOOL_OPENWATCOM-WL_LDFLAGS       ?= Option Quiet
 TOOL_OPENWATCOM-WL_LDFLAGS.dos   ?= $(NO_SUCH_VARIABLE)
 TOOL_OPENWATCOM-WL_LDFLAGS.linux ?= $(NO_SUCH_VARIABLE)
@@ -46 +47 @@
 TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPORD =
 define TOOL_OPENWATCOM-WL_LINK_PROGRAM_CMDS
-        $(QUIET)$(APPEND) -t $(outbase).rsp '$(flags)'
-        $(if $(libpath),$(QUIET)$(APPEND) -n $(outbase).rsp $(foreach p,$(subst /,\,$(libpath))\
-                ,'LIBPath $p'),)
-        $(if $(objs),$(QUIET)$(APPEND) -n $(outbase).rsp $(foreach o,$(subst /,\,$(filter-out %.res,$(objs)) $(othersrc))\
-                ,'$(if $(filter %.lib %.a,$l),LIB,)File $o'),)
-        $(if $(libs),$(QUIET)$(APPEND) -n $(outbase).rsp $(foreach l,$(subst /,\,$(libs))\
-                ,'Library $l'),)
-        $(QUIET)$(APPEND) -n $(outbase).rsp 'Map=$(outbase).map'
+        $(QUIET)$(APPEND) -tn $(outbase).rsp \
+                $(if $(flags),'$(flags)',) \
+                'Name $(subst /,\,$(out)$(if $(suffix $(out)),,.))' \
+                'Option Map=$(subst /,\,$(outbase)).map' \
+                $(foreach p,$(subst /,\,$(libpath)),'LIBPath $p') \
+        $(foreach o,$(subst /,\,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
+                $(foreach l,$(subst /,\,$(libs)),'Library $l')
         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_WLINK) @$(outbase).rsp