Changeset 2663 in kBuild

Timestamp:

Oct 15, 2012 1:13:45 PM (12 years ago)

Author:

bird

Message:

OPENWATCOM-WL.kmk: Fixed double slashes in wlink response file on Windows and OS/2.

Location:

trunk/kBuild/tools

Files:

• OPENWATCOM-WL.kmk (modified) (1 diff)
• OPENWATCOM.kmk (modified) (1 diff)

trunk/kBuild/tools/OPENWATCOM-WL.kmk

@@ -50 +50 @@
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(if $(flags),'$(flags)',) \
-                'Name $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)$(if $(suffix $(out)),,.))' \
-                'Option Map=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(outbase)).map' \
-                $(foreach p,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(libpath)),'LIBPath $p') \
-        $(foreach o,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
-                $(foreach l,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(libs)),'Library $l')
+                'Name $(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(out)$(if $(suffix $(out)),,.))' \
+                'Option Map=$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(outbase)).map' \
+                $(foreach p,$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(libpath)),'LIBPath $p') \
+                $(foreach o,$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
+                $(foreach l,$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(libs)),'Library $l')
         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_WLINK) @$(outbase).rsp

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -148 +148 @@
 endif
 
+# Functions for changing slashes (SQ = single quoted).
 if1of ($(KBUILD_HOST), os2 win)
  TOOL_OPENWATCOM_FIX_SLASHES = $(subst /,\\,$1)
+ TOOL_OPENWATCOM_FIX_SLASHES_SQ = $(subst /,\,$1)
 else
  TOOL_OPENWATCOM_FIX_SLASHES = $1
+ TOOL_OPENWATCOM_FIX_SLASHES_SQ = $1
 endif