Changeset 2572 for trunk/kBuild/tools/OPENWATCOM.kmk

Timestamp:

Apr 27, 2012, 3:19:55 PM (13 years ago)

Author:

bird

Message:

tools/OPENWATCOM*: Assembler fix. Only windows and os/2 needs the slashes switched.

File:

• trunk/kBuild/tools/OPENWATCOM.kmk (modified) (9 diffs)

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -121 +121 @@
 endif
 
+if1of ($(KBUILD_HOST), os2 win)
+ TOOL_OPENWATCOM_FIX_SLASHES = $(subst /,\\,$1)
+else
+ TOOL_OPENWATCOM_FIX_SLASHES = $1
+endif
+
 # General Properties used by kBuild
 TOOL_OPENWATCOM_ASOBJSUFF        ?= .obj
@@ -169 +175 @@
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AS) \
                 $(flags) \
-                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
                 $(addprefix -d, $(defs)) \
-                -fo=$(subst /,\\,$(obj)) \
-                -fr=$(subst /,\\,$(obj)).err \
-                $(subst /,\\,$(abspath $(source)))
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
 ## @todo dependencies
@@ -185 +191 @@
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC) \
                 $(flags) \
-                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
                 $(addprefix -d, $(defs)) \
-                -fo=$(subst /,\\,$(obj)) \
-                -fr=$(subst /,\\,$(obj)).err \
-                $(subst /,\\,$(abspath $(source)))
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
 ## @todo dependencies
@@ -200 +206 @@
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX) \
                 $(flags) \
-                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
                 $(addprefix -d, $(defs)) \
-                -fo=$(subst /,\\,$(obj)) \
-                -fr=$(subst /,\\,$(obj)).err \
-                $(subst /,\\,$(abspath $(source)))
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
 ## @todo dependencies
@@ -216 +222 @@
                 $(TOOL_OPENWATCOM_RC) -r\
                 $(flags) \
-                $(addprefix -i=, $(subst /,\\,$(incs))) \
+                $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs))) \
                 $(addprefix -d, $(defs))\
-                -fo=$(subst /,\\,$(obj)) \
-                $(subst /,\\,$(abspath $(source)))
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
 endef
 
@@ -226 +232 @@
 TOOL_OPENWATCOM_LINK_LIBRARY_DEPORD =
 define TOOL_OPENWATCOM_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(subst /,\,$(objs) $(othersrc)),'+"$(obj)"')
-        $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
+        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(objs) $(othersrc)),'+"$(obj)"')
+        $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AR) $(flags) $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) @$(outbase).rsp
 endef
 
@@ -237 +243 @@
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \
-                -fe=$(subst /,\\,$(out)) \
-                -fm=$(subst /,\\,$(outbase).map) \
-                $(subst /,\\,$(filter-out %.res,$(objs))) \
-                $(subst /,\\,$(libs)) \
-                $(subst /,\\,$(othersrc))
+                -fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                -fm=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(outbase).map) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter-out %.res,$(objs))) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(libs)) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(othersrc))
         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_RC) \
                         $(filter -bt=%,$(flags)) \
-                        /fe=$(subst /,\\,$(out)) \
-                        $(subst /,\\,$(filter %.res,$(objs))))
+                        /fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                        $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter %.res,$(objs))))
 endef
 
@@ -256 +262 @@
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \
-                -fe=$(subst /,\\,$(out)) \
-                -fm=$(subst /,\\,$(outbase).map) \
-                $(subst /,\\,$(filter-out %.res,$(objs))) \
-                $(subst /,\\,$(libs)) \
-                $(subst /,\\,$(othersrc))
+                -fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                -fm=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(outbase).map) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter-out %.res,$(objs))) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(libs)) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(othersrc))
         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_RC) \
                         $(filter -bt=%,$(flags)) \
-                        /fe=$(subst /,\\,$(out)) \
-                        $(subst /,\\,$(filter %.res,$(objs))))
+                        /fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                        $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter %.res,$(objs))))
 endef
 
@@ -275 +281 @@
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \
-                -fe=$(subst /,\\,$(out)) \
-                -fm=$(subst /,\\,$(outbase).map) \
-                $(subst /,\\,$(filter-out %.res,$(objs))) \
-                $(subst /,\\,$(libs)) \
-                $(subst /,\\,$(othersrc))
+                -fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                -fm=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(outbase).map) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter-out %.res,$(objs))) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(libs)) \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(othersrc))
         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_RC) \
                         $(filter -bt=%,$(flags)) \
-                        /fe=$(subst /,\\,$(out)) \
-                        $(subst /,\\,$(filter %.res,$(objs))))
-endef
-
+                        /fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                        $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter %.res,$(objs))))
+endef
+