diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 16:49:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 16:49:57 +0000 |
| commit | d6aa24cd1fe8bfbc3c3532ba9a05536f00a31bfb (patch) | |
| tree | 9dfbcdc00bf4cc33c92c498ed9ad90b3f2f6d559 | |
| parent | 3857372aa9eccb3f5c9f1fe34bc32be1338d56ce (diff) | |
| download | ATCD-d6aa24cd1fe8bfbc3c3532ba9a05536f00a31bfb.tar.gz | |
ChangeLogTag: Wed Jul 21 11:48:53 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 18 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks5.x_g++.GNU | 28 |
2 files changed, 34 insertions, 12 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index ef0c6f4ecd1..a9cf083084f 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,11 +1,17 @@ +Wed Jul 21 11:48:53 1999 David L. Levine <levine@cs.wustl.edu> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + use full path to $(CC) in egcs version check, to avoid + warning if it is not on the user's PATH. + Wed Jul 21 11:44:19 1999 Carlos O'Ryan <coryan@cs.wustl.edu> - * ace/OS.h: - Simplified the definition of the ACE_THR_PRI_*_DEF macros from - (MIN+(MAX-MIN)/2) to ((MIN+MAX)/2), the new definition is not - only easier to read, makes less operations (and function calls) - but it is also safer when the the priorities are "backwards" and - PRI_MAX < PRI_MIN + * ace/OS.h: + Simplified the definition of the ACE_THR_PRI_*_DEF macros from + (MIN+(MAX-MIN)/2) to ((MIN+MAX)/2), the new definition is not + only easier to read, makes less operations (and function calls) + but it is also safer when the the priorities are "backwards" and + PRI_MAX < PRI_MIN Wed Jul 21 11:40:31 1999 Steve Huston <shuston@riverace.com> diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index d82f7dc6d4d..69262035e2d 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -15,11 +15,21 @@ VXWORKS = 1 CROSS-COMPILE = 1 -debug = 1 -optimize = 1 -rtti = -shared_libs = -static_libs = 1 +ifndef debug + debug = 1 +endif # ! debug +ifndef optimize + optimize = 1 +endif # ! optimize +ifndef rtti + rtti = +endif # ! rtti +ifndef shared_libs + shared_libs = +endif # ! shared_libs +ifndef static_libs + static_libs = 1 +endif # ! static_libs ifeq (,$(WIND_BASE)) @@ -153,7 +163,13 @@ PIC = #### Tornado II uses egcs -ifeq (egcs,$(findstring egcs,$(shell $(CC) --version))) +ifndef ACE_CC + ACE_CC := $(shell PATH=${PATH} type $(CC) | sed -e 's/.* is //') +endif # ! ACE_CC +ifndef ACE_CC_VERSION + ACE_CC_VERSION := $(shell $(ACE_CC) --version) +endif # ! ACE_CC_VERSION +ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION))) ACE_HAS_GNUG_PRE_2_8 := 0 CFLAGS += -DACE_VXWORKS=0x540 ifndef exceptions |