From f2fac70923d14476486b92ea3159363570f58546 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 11 Dec 2006 19:46:39 +0000 Subject: [PATCH] Can't use ifeq(VXWORKS_VERSION) because we don't know its value yet. --- configure/os/CONFIG.Common.vxWorksCommon | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index f17eac676..39d3f155c 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -90,10 +90,11 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION)) #-------------------------------------------------- # Fix WIND_BASE for vxWorks 6.x on linux -ifeq ($(VXWORKS_MAJOR_VERSION),6) - ifeq ($(WIND_HOST_TYPE),x86-linux) - WIND_HOST_TYPE = x86-linux2 - endif +# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION +ifeq ($(WIND_HOST_TYPE),x86-linux) + WIND_HOST_TYPE_5 = $(WIND_HOST_TYPE) + WIND_HOST_TYPE_6 = x86-linux2 + WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION)) endif #-------------------------------------------------- @@ -114,9 +115,9 @@ GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION)) # vxWorks 6 moved the subprocess executable programs. -ifeq ($(VXWORKS_MAJOR_VERSION),6) - export GCC_EXEC_PREFIX = $(GNU_DIR)/libexec/gcc/ -endif +GCC_EXEC_PREFIX_5 = $(GNU_LIB)/gcc-lib/ +GCC_EXEC_PREFIX_6 = $(GNU_DIR)/libexec/gcc/ +export GCC_EXEC_PREFIX = $(GCC_EXEC_PREFIX_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- # C++ host processing