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

Timestamp:

Jun 28, 2014, 4:58:12 PM (11 years ago)

Author:

bird

Message:

wcl and wcl386 doodoos in the current directory which causes trouble for parallel execution of them.

File:

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

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -67 +67 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  else ifeq ($(KBUILD_HOST),freebsd)
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binfbsd
@@ -76 +76 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  else ifeq ($(KBUILD_HOST),linux)
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binl
@@ -85 +85 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  else ifeq ($(KBUILD_HOST),os2)
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binp
@@ -96 +96 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  else ifeq ($(KBUILD_HOST),solaris)
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binsol
@@ -105 +105 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  else
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binnt
@@ -114 +114 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  endif
 
@@ -134 +134 @@
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
-        --
+        $2 --
  TOOL_OPENWATCOM_CC    ?= wcc386$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_CC16  ?= wcc$(HOSTSUFF_EXE)
@@ -270 +270 @@
 TOOL_OPENWATCOM_LINK_PROGRAM_DEPORD =
 define TOOL_OPENWATCOM_LINK_PROGRAM_CMDS
-        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \
@@ -289 +289 @@
 TOOL_OPENWATCOM_LINK_DLL_DEPORD =
 define TOOL_OPENWATCOM_LINK_DLL_CMDS
-        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \
@@ -308 +308 @@
 TOOL_OPENWATCOM_LINK_SYSMOD_DEPORD =
 define TOOL_OPENWATCOM_LINK_SYSMOD_CMDS
-        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
                 $(TOOL_OPENWATCOM_LD) \
                 $(flags) \