epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Can't use ifeq(VXWORKS_VERSION) because we don't know its value yet.

Browse Source
This commit is contained in:
Andrew Johnson
2006-12-11 19:46:39 +00:00
parent a00a246b0d
commit f2fac70923
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure/os/CONFIG.Common.vxWorksCommon
View File

@@ -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