Changeset 2078 in kBuild

Timestamp:

Nov 18, 2008 12:52:13 AM (16 years ago)

Author:

bird

Message:

watcom and open watcom location fixes.

Location:

trunk/kBuild/tools

Files:

• OPENWATCOM.kmk (modified) (1 diff)
• WATCOMC11C.kmk (modified) (1 diff)

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -44 +44 @@
   PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS)/common/openwatcom/v*)
  endif
- if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
-  PATH_TOOL_OPENWATCOM := $(wildcard d:/dev/Watcom/v1.*)
+ ifeq ($(PATH_TOOL_OPENWATCOM)$(KBUILD_HOST),os2)
+  if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
+   PATH_TOOL_OPENWATCOM := $(wildcard d:/dev/Watcom/v1.*)
+  endif
  endif
  PATH_TOOL_OPENWATCOM := $(firstword $(sort $(PATH_TOOL_OPENWATCOM)))

trunk/kBuild/tools/WATCOMC11C.kmk

@@ -44 +44 @@
   PATH_TOOL_WATCOMC11C := $(wildcard $(PATH_DEVTOOLS)/common/watcom/v11.0c*)
  endif
- if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
-  PATH_TOOL_WATCOMC11C := $(wildcard d:/dev/Watcom/v11.0c*)
+ ifeq ($(PATH_TOOL_WATCOMC11C)$(KBUILD_HOST),os2)
+  if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
+   PATH_TOOL_WATCOMC11C := $(wildcard d:/dev/Watcom/v11.0c*)
+  endif
  endif
  PATH_TOOL_WATCOMC11C := $(firstword $(sort $(PATH_TOOL_WATCOMC11C)))