Experimental Physics and
Industrial Control System

Andrew Johnson <[email protected]> · Tue, 05 Dec 2006 13:26:17 -0600

Ernest L. Williams Jr. wrote:


This is a 6.x thing.  All releases 6.0 thru 6.3 have the following:
$(WIND_BASE)/gnu/<gnu-version>-vxworks-<version>/x86-linux2



Ok, this change in configure/os should fix it. It's a bit ugly, but

setting WIND_HOST_TYPE to the correct value in the first place isn't

really possible.


Index: CONFIG.Common.vxWorksCommon
===================================================================

RCS file:

/net/phoebus/epicsmgr/cvsroot/epics/base/configure/os/CONFIG.Common.vxWorksCommon,v

retrieving revision 1.35.2.10
diff -u -b -r1.35.2.10 CONFIG.Common.vxWorksCommon

--- CONFIG.Common.vxWorksCommon 2 Dec 2006 00:09:16 -0000       1.35.2.10
+++ CONFIG.Common.vxWorksCommon 5 Dec 2006 19:19:05 -0000
@@ -89,6 +89,14 @@
 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
+endif
+
+#--------------------------------------------------
 # vxWorks directory definitions
 VX_DIR_5 = $(WIND_BASE)
 VX_DIR_6 = $(WIND_BASE)/vxWorks-$(VXWORKS_VERSION)


I'm about to look at your other changes too.

Thanks,

- Andrew
--
There is considerable overlap between the intelligence of the smartest
bears and the dumbest tourists -- Yosemite National Park Ranger


Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System