ChangeLogTag: Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu>

1 files changed, 20 insertions, 4 deletions

diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU
index ef5fea64d5c..939f4063470 100644
--- a/include/makeinclude/platform_tru64_g++.GNU
+++ b/include/makeinclude/platform_tru64_g++.GNU
@@ -3,6 +3,10 @@
 # This platform macros file is intended to work with
 # Digital UNIX using the GNU compiler.
 
+# Of late, this platform and compiler combination hasn't been tested. In
+# fact neither compilation nor testing has been done for almost a year.
+# So it's better to avoid this combination, if possible.
+
 ifndef ACE_DU_VERSION
   ACE_DU_VERSION := $(shell uname -r)
 endif # ACE_DU_VERSION
@@ -14,17 +18,29 @@ else # ! 3.x
 ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
 
-  ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v)))
+  ifndef ACE_DU_SUBVERSION
+    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
+  endif # ! ACE_DU_SUBVERSION
+
+  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
     CFLAGS += -DDIGITAL_UNIX=0x40F
-  else  # ! 4.0F
+  else
+  ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
+    CFLAGS += -DDIGITAL_UNIX=0x40E
+  else
+  ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
+    CFLAGS += -DDIGITAL_UNIX=0x40D
+  else
     CFLAGS += -DDIGITAL_UNIX=0x400
-  endif # ! 4.0F
+  endif
+  endif
+  endif
 
 else # ! 4.x
 ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
   CFLAGS += -DDIGITAL_UNIX=0x500
-
 endif # 5.x
+
 endif # ! 4.x
 endif # ! 3.x