diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index d3ddf05bb..c1ede3ed3 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -124,15 +124,18 @@ GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- # C++ host processing + +WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin + NM_DIR_5 = $(GNU_BIN) NM_DIR_6.0 = $(GNU_BIN) NM_DIR_6.1 = $(GNU_BIN) NM_DIR_6.2 = $(GNU_BIN) NM_DIR_6.3 = $(GNU_BIN) -NM_DIR_6.4 = $(GNU_BIN) -NM_DIR_6.5 = $(GNU_BIN) -NM_DIR_6.6 = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin -NM_DIR_6.7 = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin +NM_DIR_6.4 = $(WORKBENCH_BIN) +NM_DIR_6.5 = $(WORKBENCH_BIN) +NM_DIR_6.6 = $(WORKBENCH_BIN) +NM_DIR_6.7 = $(WORKBENCH_BIN) NM_DIR_6 = $(NM_DIR_$(VXWORKS_VERSION)) NM_DIR = $(NM_DIR_$(VXWORKS_MAJOR_VERSION)) diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 08f5dc58c..6f40858ae 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -33,6 +33,7 @@ WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION) -# WorkBench Version number, used with vxWorks 6.6 and later +# WorkBench Version number, required for vxWorks 6.x +#WORKBENCH_VERSION = 2.6 #WORKBENCH_VERSION = 3.0