Changeset 2572 for trunk/kBuild/tools/OPENWATCOM-16.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-16.kmk (modified) (8 diffs)

trunk/kBuild/tools/OPENWATCOM-16.kmk

@@ -46 +46 @@
 TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT = $(obj).err
 define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
-        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC16) \
+        $(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
@@ -63 +63 @@
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC16) \
                 $(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
@@ -78 +78 @@
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX16) \
                 $(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
@@ -94 +94 @@
                 $(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
 
@@ -104 +104 @@
 TOOL_OPENWATCOM-16_LINK_LIBRARY_DEPORD =
 define TOOL_OPENWATCOM-16_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
 
 TOOL_OPENWATCOM-16_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_OPENWATCOM-16_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).sym
 TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPORD =
@@ -115 +116 @@
                 $(TOOL_OPENWATCOM_LD16) \
                 $(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
 
 TOOL_OPENWATCOM-16_LINK_DLL_OUTPUT = $(outbase).map
+TOOL_OPENWATCOM-16_LINK_DLL_OUTPUT_MAYBE = $(outbase).sym
 TOOL_OPENWATCOM-16_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_OPENWATCOM-16_LINK_DLL_DEPORD =
@@ -134 +136 @@
                 $(TOOL_OPENWATCOM_LD16) \
                 $(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
 
 TOOL_OPENWATCOM-16_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_OPENWATCOM-16_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).sym
 TOOL_OPENWATCOM-16_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_OPENWATCOM-16_LINK_SYSMOD_DEPORD =
@@ -153 +156 @@
                 $(TOOL_OPENWATCOM_LD16) \
                 $(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