summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 15:42:09 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 15:42:09 +0000
commit20dabca38f99900551af5cf8ea024ff7a1e6c4c6 (patch)
treeffc44989f4c2486d28db05146986fd403ec58d81
parentb5450d6cec4417351c6b5fac84dcc8f4403f5ee6 (diff)
downloadATCD-VxWorks_shlib.tar.gz
ChangeLogTag: Wed Jul 28 10:32:11 1999 David L. Levine <levine@cs.wustl.edu>VxWorks_shlib
-rw-r--r--include/makeinclude/platform_vxworks5.x_g++.GNU12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 531c3a3840b..7a116393900 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -11,6 +11,8 @@
#### because it contains identifiers with ".", e.g., ".cpp", in them:
#### add a global variable or function to that .cpp file. See
#### ace/IOStream_T.cpp for an explanation and example.
+#### 3) If you're building on a WIN32 host, be sure that $(CC) is on
+#### your PATH (or is a full pathname).
VXWORKS = 1
CROSS-COMPILE = 1
@@ -160,7 +162,15 @@ PIC =
#### Tornado II uses egcs
ifndef ACE_CC
- ACE_CC := $(shell PATH=${PATH} type $(CC) | sed -e 's/.* is //')
+ ifdef COMSPEC
+ #### Assume we're on a WIN32 host. Further, assume that $(CC)
+ #### is on the user's PATH.
+ ACE_CC := $(CC)
+ else # ! COMSPEC
+ #### Don't use this on WIN32 host, because the shell there seems
+ #### to have trouble exec'ing sed.
+ ACE_CC := $(shell PATH=${PATH} type $(CC) | sed -e 's/.* is //')
+ endif # ! COMSPEC
endif # ! ACE_CC
ifndef ACE_CC_VERSION
ACE_CC_VERSION := $(shell $(ACE_CC) --version)