diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 599c892bf..a5fb384cf 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -45,6 +45,9 @@ OP_SYS_CFLAGS += -fno-strict-aliasing CODE_CXXFLAGS_OLD = -fno-implicit-templates CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC)) +# WIND_BASE is where you installed the Wind River software. +WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION) + #-------------------------------------------------- # Modules we cannot build with old compiler @@ -54,23 +57,3 @@ SKIP_BUILDS_OLD = $(PV_MODULES) SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC)) SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION)) -############# - -# Compiler options can vary with the vxWorks version number, so we -# need to know that. Do not include any third-level digits. - -# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported. -# VxWorks 6.0 through 6.5 use older, untested versions of GCC. - -#VXWORKS_VERSION = 6.6 -#VXWORKS_VERSION = 6.7 -#VXWORKS_VERSION = 6.8 -VXWORKS_VERSION = 6.9 - - -# Sites may override the following path for a particular host -# architecture by adding it to an appropriate -# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file. - -# WIND_BASE is where you installed the Wind River software. -WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)