From 6142ff3ece56c28446bcf76f13de60c4561372aa Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 27 Apr 2010 17:53:40 -0500 Subject: [PATCH] Steve Hartman (ORNL) says vxWorks 6.7 has nm back in GNU_BIN. Hopefully it will stay there from now on. --- configure/os/CONFIG.Common.vxWorksCommon | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index c1ede3ed3..4c0816d85 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -123,21 +123,14 @@ GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- -# C++ host processing +# Wind River moved nm out of GNU_DIR in some versions 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 = $(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)) +NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN)) NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)